diff options
| author | mav <mav@FreeBSD.org> | 2015-10-01 12:57:37 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-01 12:57:37 +0000 |
| commit | 8111cd0fbf081d5bffee10004b3911c654ca08f0 (patch) | |
| tree | d3f255c75e820e0afd194fdb5fb4cd38b7005d4f /sys/cam | |
| parent | 14e7a5f18f6c760c911ad6ac95f323e26c2154bf (diff) | |
| download | FreeBSD-src-8111cd0fbf081d5bffee10004b3911c654ca08f0.zip FreeBSD-src-8111cd0fbf081d5bffee10004b3911c654ca08f0.tar.gz | |
Implement SPC-3 exceptions to SPC-2 RESERVE and RELEASE behavior.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ctl/ctl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 52319ea..30c4eb0 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -5101,6 +5101,13 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio) ctl_set_reservation_conflict(ctsio); goto bailout; } + + /* SPC-3 exceptions to SPC-2 RESERVE and RELEASE behavior. */ + if (lun->flags & CTL_LUN_PR_RESERVED) { + ctl_set_success(ctsio); + goto bailout; + } + lun->flags |= CTL_LUN_RESERVED; lun->res_idx = residx; ctl_set_success(ctsio); @@ -7624,7 +7631,8 @@ retry: res_cap = (struct scsi_per_res_cap *)ctsio->kern_data_ptr; scsi_ulto2b(sizeof(*res_cap), res_cap->length); - res_cap->flags2 |= SPRI_TMV | SPRI_ALLOW_5; + res_cap->flags1 = SPRI_CRH; + res_cap->flags2 = SPRI_TMV | SPRI_ALLOW_5; type_mask = SPRI_TM_WR_EX_AR | SPRI_TM_EX_AC_RO | SPRI_TM_WR_EX_RO | |
