From 8efd882c37f54367a52ef9f8b8ebc7361b1a3834 Mon Sep 17 00:00:00 2001
From: mav <mav@FreeBSD.org>
Date: Fri, 30 Jun 2017 06:34:49 +0000
Subject: [PATCH] Unify INOT/ATIO setup.
---
sys/cam/ctl/scsi_ctl.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 7d25170f76a9..03b0d38e8b77 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -523,7 +523,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;
@@ -570,7 +570,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;
@@ -1003,10 +1003,7 @@ ctlfe_requeue_ccb(struct cam_periph *periph, union ccb *ccb, int unlock)
* 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);
}