diff options
| author | mav <mav@FreeBSD.org> | 2017-08-01 13:07:05 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-08-01 13:07:05 +0000 |
| commit | 30f3c1db8424cd2a057c4edc318534b0ff02d927 (patch) | |
| tree | f857fa18663094da35b5efadeff770414e03fd4c | |
| parent | 5a84c4e03411bf9871d8bf9dc628622f294afbf7 (diff) | |
| download | FreeBSD-src-30f3c1db8424cd2a057c4edc318534b0ff02d927.zip FreeBSD-src-30f3c1db8424cd2a057c4edc318534b0ff02d927.tar.gz | |
MFC r320493: Unify INOT/ATIO setup.
| -rw-r--r-- | sys/cam/ctl/scsi_ctl.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index 8400af2..18d429b 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -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 *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); } |
