Date: Fri, 19 Feb 2016 17:14:34 +0000 (UTC) From: "Kenneth D. Merry" <ken@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r295819 - stable/10/sys/cam/scsi Message-ID: <201602191714.u1JHEYVA067241@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ken Date: Fri Feb 19 17:14:34 2016 New Revision: 295819 URL: https://svnweb.freebsd.org/changeset/base/295819 Log: MFC, r295417: r295417 | ken | 2016-02-08 15:13:08 -0700 (Mon, 08 Feb 2016) | 9 lines Fix the SCSI Extended INQUIRY probe case when an error is returned and a retry is scheduled. Instead of leaving the device queue frozen, unfreeze the device queue so that the retry can happen. Sponsored by: Spectra Logic Approved by: re (gjb) Modified: stable/10/sys/cam/scsi/scsi_xpt.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/scsi/scsi_xpt.c ============================================================================== --- stable/10/sys/cam/scsi/scsi_xpt.c Fri Feb 19 16:56:07 2016 (r295818) +++ stable/10/sys/cam/scsi/scsi_xpt.c Fri Feb 19 17:14:34 2016 (r295819) @@ -1521,7 +1521,7 @@ out: } else if (cam_periph_error(done_ccb, 0, SF_RETRY_UA, &softc->saved_ccb) == ERESTART) { - return; + goto outr; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602191714.u1JHEYVA067241>