summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornjl <njl@FreeBSD.org>2003-08-06 14:24:16 +0000
committernjl <njl@FreeBSD.org>2003-08-06 14:24:16 +0000
commitc2ce7aecc7fac7b230a1d5b52d97781fa072a273 (patch)
tree5968eaecfc2d7e987eb1f88e3b5d79afa8a6b792
parentf02f488d853da002790d6e991704ebcb57de34cc (diff)
downloadFreeBSD-src-c2ce7aecc7fac7b230a1d5b52d97781fa072a273.zip
FreeBSD-src-c2ce7aecc7fac7b230a1d5b52d97781fa072a273.tar.gz
Remove unused cmd6workaround() calls.
MFC after: 1 day
-rw-r--r--sys/cam/scsi/scsi_da.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index ca7c6e5..fe732d0 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1499,15 +1499,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
} else {
bp->bio_resid = csio->resid;
bp->bio_error = 0;
- if (bp->bio_resid != 0) {
- /* Short transfer ??? */
-#if 0
- if (cmd6workaround(done_ccb)
- == ERESTART)
- return;
-#endif
+ if (bp->bio_resid != 0)
bp->bio_flags |= BIO_ERROR;
- }
}
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
cam_release_devq(done_ccb->ccb_h.path,
@@ -1519,14 +1512,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
panic("REQ_CMP with QFRZN");
bp->bio_resid = csio->resid;
- if (csio->resid > 0) {
- /* Short transfer ??? */
-#if 0 /* XXX most of the broken umass devices need this ad-hoc work around */
- if (cmd6workaround(done_ccb) == ERESTART)
- return;
-#endif
+ if (csio->resid > 0)
bp->bio_flags |= BIO_ERROR;
- }
}
/*
OpenPOWER on IntegriCloud