svn commit: r321871 - stable/11/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Tue Aug  1 13:07:05 2017
New Revision: 321871
URL: https://svnweb.freebsd.org/changeset/base/321871

Log:
  MFC r320493: Unify INOT/ATIO setup.

Modified:
  stable/11/sys/cam/ctl/scsi_ctl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- stable/11/sys/cam/ctl/scsi_ctl.c	Tue Aug  1 13:03:06 2017	(r321870)
+++ stable/11/sys/cam/ctl/scsi_ctl.c	Tue Aug  1 13:07:05 2017	(r321871)
@@ -529,7 +529,7 @@ ctlferegister(struct cam_periph *periph, void *arg)
 		new_ccb->ccb_h.io_ptr = new_io;
 		LIST_INSERT_HEAD(&softc->atio_list, &new_ccb->ccb_h, periph_links.le);
 
-		xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1);
+		xpt_setup_ccb(&new_ccb->ccb_h, periph->path, CAM_PRIORITY_NONE);
 		new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO;
 		new_ccb->ccb_h.cbfcnp = ctlfedone;
 		new_ccb->ccb_h.flags |= CAM_UNLOCKED;
@@ -576,7 +576,7 @@ ctlferegister(struct cam_periph *periph, void *arg)
 		new_ccb->ccb_h.io_ptr = new_io;
 		LIST_INSERT_HEAD(&softc->inot_list, &new_ccb->ccb_h, periph_links.le);
 
-		xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1);
+		xpt_setup_ccb(&new_ccb->ccb_h, periph->path, CAM_PRIORITY_NONE);
 		new_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY;
 		new_ccb->ccb_h.cbfcnp = ctlfedone;
 		new_ccb->ccb_h.flags |= CAM_UNLOCKED;
@@ -1009,10 +1009,7 @@ ctlfe_requeue_ccb(struct cam_periph *periph, union ccb
 	 * target/lun.  Reset the target and LUN fields back to the wildcard
 	 * values before we send them back down to the SIM.
 	 */
-	if (softc->flags & CTLFE_LUN_WILDCARD) {
-		ccb->ccb_h.target_id = CAM_TARGET_WILDCARD;
-		ccb->ccb_h.target_lun = CAM_LUN_WILDCARD;
-	}
+	xpt_setup_ccb(&ccb->ccb_h, periph->path, CAM_PRIORITY_NONE);
 
 	xpt_action(ccb);
 }