svn commit: r275009 - head/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Tue Nov 25 06:11:05 2014
New Revision: 275009
URL: https://svnweb.freebsd.org/changeset/base/275009

Log:
  Use ctl_set_success() instead of direct inlining.
  
  MFC after:    1 week

Modified:
  head/sys/cam/ctl/ctl.c
  head/sys/cam/ctl/ctl_backend_ramdisk.c

Modified: head/sys/cam/ctl/ctl.c
==============================================================================
--- head/sys/cam/ctl/ctl.c      Tue Nov 25 05:57:12 2014        (r275008)
+++ head/sys/cam/ctl/ctl.c      Tue Nov 25 06:11:05 2014        (r275009)
@@ -5211,8 +5211,7 @@ ctl_scsi_release(struct ctl_scsiio *ctsi
 
        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);
@@ -5299,8 +5298,7 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsi
        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);
@@ -5610,8 +5608,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) {
@@ -9600,9 +9597,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);

Modified: head/sys/cam/ctl/ctl_backend_ramdisk.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_ramdisk.c      Tue Nov 25 05:57:12 2014        
(r275008)
+++ head/sys/cam/ctl/ctl_backend_ramdisk.c      Tue Nov 25 06:11:05 2014        
(r275009)
@@ -250,7 +250,7 @@ ctl_backend_ramdisk_move_done(union ctl_
                            &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)){
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"