From owner-svn-src-head@FreeBSD.ORG  Thu Oct  2 10:02:39 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4086BDE0;
 Thu,  2 Oct 2014 10:02:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 2C4BA8B0;
 Thu,  2 Oct 2014 10:02:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s92A2dLM083011;
 Thu, 2 Oct 2014 10:02:39 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s92A2dS8083010;
 Thu, 2 Oct 2014 10:02:39 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201410021002.s92A2dS8083010@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 2 Oct 2014 10:02:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272402 - head/sys/cam/scsi
X-SVN-Group: head
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Oct 2014 10:02:39 -0000

Author: mav
Date: Thu Oct  2 10:02:38 2014
New Revision: 272402
URL: https://svnweb.freebsd.org/changeset/base/272402

Log:
  Restore CAM_QUIRK_NOLUNS check, lost in previous commit.
  
  MFC after:	1 month

Modified:
  head/sys/cam/scsi/scsi_xpt.c

Modified: head/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- head/sys/cam/scsi/scsi_xpt.c	Thu Oct  2 09:42:11 2014	(r272401)
+++ head/sys/cam/scsi/scsi_xpt.c	Thu Oct  2 10:02:38 2014	(r272402)
@@ -2074,6 +2074,9 @@ scsi_scan_bus(struct cam_periph *periph,
 			mtx_unlock(&target->bus->eb_mtx);
 			if (nextdev != NULL) {
 				next_target = 0;
+			/*  -- stop if CAM_QUIRK_NOLUNS is set. */
+			} else if (SCSI_QUIRK(device)->quirks & CAM_QUIRK_NOLUNS) {
+				next_target = 1;
 			/*  -- this LUN is connected and its SCSI version
 			 *     allows more LUNs. */
 			} else if ((device->flags & CAM_DEV_UNCONFIGURED) == 0) {