git: 887841731be6 - main - ctl: Use CAM_PRIORITY_NORMAL for queued CCBs

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=887841731be60a958e471b9fd79261169b67b7ad

commit 887841731be60a958e471b9fd79261169b67b7ad
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2026-05-27 20:58:05 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2026-05-27 20:58:05 +0000

    ctl: Use CAM_PRIORITY_NORMAL for queued CCBs
    
    Previously this was using CAM_PRIORITY_NONE which tripped over the
    assertion added in b4b166b8c46b8.
    
    PR:             293076
    Reported by:    Ken J. Thomson <thomsonk@yandex.com>
    Reviewed by:    imp
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D56995
---
 sys/cam/ctl/scsi_ctl.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 68f1cabf6d07..6a55aba2669b 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -522,7 +522,8 @@ 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, CAM_PRIORITY_NONE);
+		xpt_setup_ccb(&new_ccb->ccb_h, periph->path,
+		    CAM_PRIORITY_NORMAL);
 		new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO;
 		new_ccb->ccb_h.cbfcnp = ctlfedone;
 		new_ccb->ccb_h.flags |= CAM_UNLOCKED;
@@ -569,7 +570,8 @@ 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, CAM_PRIORITY_NONE);
+		xpt_setup_ccb(&new_ccb->ccb_h, periph->path,
+		    CAM_PRIORITY_NORMAL);
 		new_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY;
 		new_ccb->ccb_h.cbfcnp = ctlfedone;
 		new_ccb->ccb_h.flags |= CAM_UNLOCKED;
@@ -1003,7 +1005,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.
 	 */
-	xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NONE,
+	xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NORMAL,
 	    ccb->ccb_h.flags);
 
 	xpt_action(ccb);