diff options
| author | markj <markj@FreeBSD.org> | 2015-09-30 03:33:28 +0000 |
|---|---|---|
| committer | markj <markj@FreeBSD.org> | 2015-09-30 03:33:28 +0000 |
| commit | 8b8e712dff75e5d3064317f46f4a7b95bcbf3ac0 (patch) | |
| tree | 3a03ce05f327b64b712dbe4f96ca53c643f6a965 /sys/cam | |
| parent | bbc4a5345e94038d139df90a75a74b18def3ef49 (diff) | |
| download | FreeBSD-src-8b8e712dff75e5d3064317f46f4a7b95bcbf3ac0.zip FreeBSD-src-8b8e712dff75e5d3064317f46f4a7b95bcbf3ac0.tar.gz | |
MFC r287806:
Preserve the device queue status before retrying a sense request in
chdone().
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/scsi/scsi_ch.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c index 38acb01..bc398e7 100644 --- a/sys/cam/scsi/scsi_ch.c +++ b/sys/cam/scsi/scsi_ch.c @@ -655,11 +655,13 @@ chdone(struct cam_periph *periph, union ccb *done_ccb) */ return; } else if (error != 0) { - int retry_scheduled; struct scsi_mode_sense_6 *sms; + int frozen, retry_scheduled; sms = (struct scsi_mode_sense_6 *) done_ccb->csio.cdb_io.cdb_bytes; + frozen = (done_ccb->ccb_h.status & + CAM_DEV_QFRZN) != 0; /* * Check to see if block descriptors were @@ -670,7 +672,8 @@ chdone(struct cam_periph *periph, union ccb *done_ccb) * block descriptors were disabled, enable * them and re-send the command. */ - if (sms->byte2 & SMS_DBD) { + if ((sms->byte2 & SMS_DBD) != 0 && + (periph->flags & CAM_PERIPH_INVALID) == 0) { sms->byte2 &= ~SMS_DBD; xpt_action(done_ccb); softc->quirks |= CH_Q_NO_DBD; @@ -679,7 +682,7 @@ chdone(struct cam_periph *periph, union ccb *done_ccb) retry_scheduled = 0; /* Don't wedge this device's queue */ - if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + if (frozen) cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, |
