svn commit: r203894 - stable/8/sys/cam/ata

[Alexander Motin]

Author: mav
Date: Sun Feb 14 19:51:39 2010
New Revision: 203894
URL: http://svn.freebsd.org/changeset/base/203894

Log:
  MFC r203499:
  On probe error, if restart requested, skip any retries and recovery.
  Just restart probe from the beginning immediately.

Modified:
  stable/8/sys/cam/ata/ata_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/ata/ata_xpt.c
==============================================================================
--- stable/8/sys/cam/ata/ata_xpt.c	Sun Feb 14 19:50:33 2010	(r203893)
+++ stable/8/sys/cam/ata/ata_xpt.c	Sun Feb 14 19:51:39 2010	(r203894)
@@ -693,7 +693,8 @@ probedone(struct cam_periph *periph, uni
 	ident_buf = &path->device->ident_data;
 
 	if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-device_fail:	if (cam_periph_error(done_ccb, 0, 0, NULL) == ERESTART) {
+device_fail:	if ((!softc->restart) &&
+		    cam_periph_error(done_ccb, 0, 0, NULL) == ERESTART) {
 			return;
 		} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			/* Don't wedge the queue */