diff options
| author | mav <mav@FreeBSD.org> | 2009-11-14 20:13:38 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2009-11-14 20:13:38 +0000 |
| commit | 2f5418e2b9f72a27fd6515faa265998fda9f1d0b (patch) | |
| tree | 352bf63383ab97b930ea51f43c617d5cf95be212 /sys/cam/scsi | |
| parent | 65ae6957dab32b28124a7f314768cb788541ec8c (diff) | |
| download | FreeBSD-src-2f5418e2b9f72a27fd6515faa265998fda9f1d0b.zip FreeBSD-src-2f5418e2b9f72a27fd6515faa265998fda9f1d0b.tar.gz | |
MFp4:
Fix several device freeze counting bugs.
Diffstat (limited to 'sys/cam/scsi')
| -rw-r--r-- | sys/cam/scsi/scsi_cd.c | 6 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_ch.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index f2a612b..7bd6158 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -1570,7 +1570,8 @@ cddone(struct cam_periph *periph, union ccb *done_ccb) bp->bio_resid = bp->bio_bcount; bp->bio_error = error; bp->bio_flags |= BIO_ERROR; - cam_release_devq(done_ccb->ccb_h.path, + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, @@ -1658,7 +1659,8 @@ cddone(struct cam_periph *periph, union ccb *done_ccb) struct ccb_getdev cgd; /* Don't wedge this device's queue */ - cam_release_devq(done_ccb->ccb_h.path, + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c index 781245a..2829a15 100644 --- a/sys/cam/scsi/scsi_ch.c +++ b/sys/cam/scsi/scsi_ch.c @@ -606,7 +606,8 @@ chdone(struct cam_periph *periph, union ccb *done_ccb) retry_scheduled = 0; /* Don't wedge this device's queue */ - cam_release_devq(done_ccb->ccb_h.path, + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, |
