svn commit: r275879 - stable/10/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Thu Dec 18 08:23:04 2014
New Revision: 275879
URL: https://svnweb.freebsd.org/changeset/base/275879

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

Modified:
  stable/10/sys/cam/ctl/ctl.c
  stable/10/sys/cam/ctl/ctl_backend_ramdisk.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c	Thu Dec 18 08:22:16 2014	(r275878)
+++ stable/10/sys/cam/ctl/ctl.c	Thu Dec 18 08:23:04 2014	(r275879)
@@ -5213,8 +5213,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);
@@ -5301,8 +5300,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);
@@ -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);

Modified: stable/10/sys/cam/ctl/ctl_backend_ramdisk.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_backend_ramdisk.c	Thu Dec 18 08:22:16 2014	(r275878)
+++ stable/10/sys/cam/ctl/ctl_backend_ramdisk.c	Thu Dec 18 08:23:04 2014	(r275879)
@@ -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)){