svn commit: r204253 - head/sys/cam

[Alexander Motin]

Author: mav
Date: Tue Feb 23 18:42:07 2010
New Revision: 204253
URL: http://svn.freebsd.org/changeset/base/204253

Log:
  Make xpt_rescan() more correct, as it was before r197208: do not use
  XPT_SCAN_LUN for wildcard LUN, fall back to XPT_SCAN_BUS.

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Tue Feb 23 18:37:21 2010	(r204252)
+++ head/sys/cam/cam_xpt.c	Tue Feb 23 18:42:07 2010	(r204253)
@@ -866,7 +866,8 @@ xpt_rescan(union ccb *ccb)
 	struct ccb_hdr *hdr;
 
 	/* Prepare request */
-	if(ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD)
+	if (ccb->ccb_h.path->target->target_id == CAM_TARGET_WILDCARD ||
+	    ccb->ccb_h.path->device->lun_id == CAM_LUN_WILDCARD)
 		ccb->ccb_h.func_code = XPT_SCAN_BUS;
 	else
 		ccb->ccb_h.func_code = XPT_SCAN_LUN;