svn commit: r295417 - head/sys/cam/scsi

[Kenneth D. Merry]

Author: ken
Date: Mon Feb  8 22:13:08 2016
New Revision: 295417
URL: https://svnweb.freebsd.org/changeset/base/295417

Log:
  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
  MFC after:	3 days

Modified:
  head/sys/cam/scsi/scsi_xpt.c

Modified: head/sys/cam/scsi/scsi_xpt.c
==============================================================================
--- head/sys/cam/scsi/scsi_xpt.c	Mon Feb  8 22:02:56 2016	(r295416)
+++ head/sys/cam/scsi/scsi_xpt.c	Mon Feb  8 22:13:08 2016	(r295417)
@@ -1518,7 +1518,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,