svn commit: r204530 - stable/8/sys/cam

[Alexander Motin]

Author: mav
Date: Mon Mar  1 19:32:34 2010
New Revision: 204530
URL: http://svn.freebsd.org/changeset/base/204530

Log:
  MFC r204253:
  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:
  stable/8/sys/cam/cam_xpt.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/cam/cam_xpt.c
==============================================================================
--- stable/8/sys/cam/cam_xpt.c	Mon Mar  1 19:19:30 2010	(r204529)
+++ stable/8/sys/cam/cam_xpt.c	Mon Mar  1 19:32:34 2010	(r204530)
@@ -861,7 +861,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;