diff options
author | ken <ken@FreeBSD.org> | 2016-02-08 22:13:08 +0000 |
---|---|---|
committer | ken <ken@FreeBSD.org> | 2016-02-08 22:13:08 +0000 |
commit | 63a60c271f3a9672a5c6327c1c29d5e5e80d56c9 (patch) | |
tree | 0243b8f3cd61fc45dfec5918afdc6317a8a71a5c /sys/cam | |
parent | ea49a7d810b717845d6cd16b2013e1100014cec6 (diff) | |
download | FreeBSD-src-63a60c271f3a9672a5c6327c1c29d5e5e80d56c9.zip FreeBSD-src-63a60c271f3a9672a5c6327c1c29d5e5e80d56c9.tar.gz |
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
Diffstat (limited to 'sys/cam')
-rw-r--r-- | sys/cam/scsi/scsi_xpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 7cffd67..c0cc310 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -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, |