d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r275009: Use ctl_set_success() instead of direct inlining.

Browse Source
This commit is contained in:
mav 2014-12-18 08:23:04 +00:00
parent 91695c330f
commit 347eb16c88
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/cam/ctl/ctl.c
View File

@ -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);

2
sys/cam/ctl/ctl_backend_ramdisk.c
View File

@ -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)){