From owner-svn-src-head@freebsd.org  Wed Aug  9 09:13:17 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4594DDC7A9D;
 Wed,  9 Aug 2017 09:13:17 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 135A769BD3;
 Wed,  9 Aug 2017 09:13:17 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v799DGZ9011216;
 Wed, 9 Aug 2017 09:13:16 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v799DGiv011215;
 Wed, 9 Aug 2017 09:13:16 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201708090913.v799DGiv011215@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 9 Aug 2017 09:13:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322302 - head/sys/cam/ctl
X-SVN-Group: head
X-SVN-Commit-Author: mav
X-SVN-Commit-Paths: head/sys/cam/ctl
X-SVN-Commit-Revision: 322302
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Aug 2017 09:13:17 -0000

Author: mav
Date: Wed Aug  9 09:13:15 2017
New Revision: 322302
URL: https://svnweb.freebsd.org/changeset/base/322302

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

Modified:
  head/sys/cam/ctl/scsi_ctl.c

Modified: head/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- head/sys/cam/ctl/scsi_ctl.c	Wed Aug  9 08:57:00 2017	(r322301)
+++ head/sys/cam/ctl/scsi_ctl.c	Wed Aug  9 09:13:15 2017	(r322302)
@@ -1003,7 +1003,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);
 }