Date: Thu, 4 Feb 2010 18:56:38 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r203499 - head/sys/cam/ata Message-ID: <201002041856.o14Iuc1T001799@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Feb 4 18:56:38 2010 New Revision: 203499 URL: http://svn.freebsd.org/changeset/base/203499 Log: On probe error, if restart requested, skip any retries and recovery. Just restart probe from the beginning immediately. Modified: head/sys/cam/ata/ata_xpt.c Modified: head/sys/cam/ata/ata_xpt.c ============================================================================== --- head/sys/cam/ata/ata_xpt.c Thu Feb 4 18:43:05 2010 (r203498) +++ head/sys/cam/ata/ata_xpt.c Thu Feb 4 18:56:38 2010 (r203499) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002041856.o14Iuc1T001799>