svn commit: r255501 - head/sys/dev/mps

[Kenneth D. Merry]

Author: ken
Date: Thu Sep 12 22:06:12 2013
New Revision: 255501
URL: http://svnweb.freebsd.org/changeset/base/255501

Log:
  Fix an issue that caused Integrated RAID volumes on LSI mps(4) controllers
  to not get scanned on boot.
  
  The problem originated in change 253549.  With the change to the mps(4)
  driver to scan only targets that it knows it has (as opposed to scanning
  the entire bus), scanning RAID volumes on boot was omitted.
  
  So, for versions of FreeBSD that have the scanning changes
  (__FreeBSD_version 1000039 and higher), scan RAID volumes that are added
  whether or not we're booting.
  
  PR:		kern/181784
  Reported by:	Xiguang Wang <kurapica at gmail.com>
  Tested by:	Dennis Glatting <dg at pki2.com>
  Sponsored by:	Spectra Logic
  Approved by:	re (delphij)
  MFC After:	3 days

Modified:
  head/sys/dev/mps/mps_sas_lsi.c

Modified: head/sys/dev/mps/mps_sas_lsi.c
==============================================================================
--- head/sys/dev/mps/mps_sas_lsi.c	Thu Sep 12 21:24:59 2013	(r255500)
+++ head/sys/dev/mps/mps_sas_lsi.c	Thu Sep 12 22:06:12 2013	(r255501)
@@ -898,7 +898,9 @@ mpssas_volume_add(struct mps_softc *sc, 
 		free(lun, M_MPT2);
 	}
 	SLIST_INIT(&targ->luns);
+#if __FreeBSD_version < 1000039
 	if ((sassc->flags & MPSSAS_IN_STARTUP) == 0)
+#endif
 		mpssas_rescan_target(sc, targ);
 	mps_dprint(sc, MPS_MAPPING, "RAID target id %d added (WWID = 0x%jx)\n",
 	    targ->tid, wwid);