svn commit: r272402 - head/sys/cam/scsi

[Alexander Motin]

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) {