diff options
| author | mav <mav@FreeBSD.org> | 2014-12-18 08:23:04 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-12-18 08:23:04 +0000 |
| commit | 347eb16c8853e2860c78635a0223292da3e10be2 (patch) | |
| tree | 826bc482f72439c0ea1c2eec71dd7e1de5c46335 /sys | |
| parent | 91695c330f82f4339890746020064a7c7d4e1dc0 (diff) | |
| download | FreeBSD-src-347eb16c8853e2860c78635a0223292da3e10be2.zip FreeBSD-src-347eb16c8853e2860c78635a0223292da3e10be2.tar.gz | |
MFC r275009: Use ctl_set_success() instead of direct inlining.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cam/ctl/ctl.c | 13 | ||||
| -rw-r--r-- | sys/cam/ctl/ctl_backend_ramdisk.c | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 9087bc6..2bf3b54 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -5213,8 +5213,7 @@ ctl_scsi_release(struct ctl_scsiio *ctsio) mtx_unlock(&lun->lun_lock); - ctsio->scsi_status = SCSI_STATUS_OK; - ctsio->io_hdr.status = CTL_SUCCESS; + ctl_set_success(ctsio); if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) { free(ctsio->kern_data_ptr, M_CTL); @@ -5301,8 +5300,7 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio) lun->flags |= CTL_LUN_RESERVED; lun->res_idx = residx; - ctsio->scsi_status = SCSI_STATUS_OK; - ctsio->io_hdr.status = CTL_SUCCESS; + ctl_set_success(ctsio); bailout: mtx_unlock(&lun->lun_lock); @@ -5612,8 +5610,7 @@ ctl_format(struct ctl_scsiio *ctsio) lun->flags &= ~CTL_LUN_INOPERABLE; mtx_unlock(&lun->lun_lock); - ctsio->scsi_status = SCSI_STATUS_OK; - ctsio->io_hdr.status = CTL_SUCCESS; + ctl_set_success(ctsio); bailout: if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) { @@ -9608,9 +9605,7 @@ ctl_tur(struct ctl_scsiio *ctsio) CTL_DEBUG_PRINT(("ctl_tur\n")); - ctsio->scsi_status = SCSI_STATUS_OK; - ctsio->io_hdr.status = CTL_SUCCESS; - + ctl_set_success(ctsio); ctl_done((union ctl_io *)ctsio); return (CTL_RETVAL_COMPLETE); diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c index 5f45035..3532459 100644 --- a/sys/cam/ctl/ctl_backend_ramdisk.c +++ b/sys/cam/ctl/ctl_backend_ramdisk.c @@ -250,7 +250,7 @@ ctl_backend_ramdisk_move_done(union ctl_io *io) &be_lun->io_task); return (0); } - io->io_hdr.status = CTL_SUCCESS; + ctl_set_success(&io->scsiio); } else if ((io->io_hdr.port_status != 0) && ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0) && ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE)){ |
