svn commit: r204246 - head/sys/dev/isp

[Matt Jacob]

Author: mjacob
Date: Tue Feb 23 14:35:44 2010
New Revision: 204246
URL: http://svn.freebsd.org/changeset/base/204246

Log:
  xpt_rescan only honors a wildcard in the target field. Revert the previous
  change and have isp_make_here scan the whole bus which will then scan all
  luns.
  
  I think xpt_rescan needs to be fixed, but that's a separable issue.
  
  Suggested by: Alexander

Modified:
  head/sys/dev/isp/isp_freebsd.c

Modified: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c	Tue Feb 23 09:58:12 2010	(r204245)
+++ head/sys/dev/isp/isp_freebsd.c	Tue Feb 23 14:35:44 2010	(r204246)
@@ -3892,7 +3892,12 @@ isp_make_here(ispsoftc_t *isp, int chan,
 		isp_prt(isp, ISP_LOGWARN, "Chan %d unable to alloc CCB for rescan", chan);
 		return;
 	}
-	if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(fc->sim), tgt, 0) != CAM_REQ_CMP) {
+	/*
+	 * xpt_rescan only honors wildcard in the target field. 
+	 * Scan the whole bus instead of target, which will then
+	 * force a scan of all luns.
+	 */
+	if (xpt_create_path(&ccb->ccb_h.path, xpt_periph, cam_sim_path(fc->sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
 		isp_prt(isp, ISP_LOGWARN, "unable to create path for rescan");
 		xpt_free_ccb(ccb);
 		return;