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

[Alexander Motin]

Author: mav
Date: Sat Aug 12 10:22:18 2017
New Revision: 322423
URL: https://svnweb.freebsd.org/changeset/base/322423

Log:
  MFC r322302: Do not loose CCB flags after r320493.
  
  There is at least CAM_UNLOCKED that should be kept.

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	Sat Aug 12 08:51:19 2017	(r322422)
+++ stable/11/sys/cam/ctl/scsi_ctl.c	Sat Aug 12 10:22:18 2017	(r322423)
@@ -1009,7 +1009,8 @@ 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.
 	 */
-	xpt_setup_ccb(&ccb->ccb_h, periph->path, CAM_PRIORITY_NONE);
+	xpt_setup_ccb_flags(&ccb->ccb_h, periph->path, CAM_PRIORITY_NONE,
+	    ccb->ccb_h.flags);
 
 	xpt_action(ccb);
 }