diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2017-05-29 07:47:14 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2017-05-29 07:47:14 +0000 |
| commit | 245c3b4a67f2e070b52fa98e6448ebfad494cd7b (patch) | |
| tree | 239a7fe1b0373d68a45a1b7b38c67b6b0ed3e84c /sys/scsi/cd.c | |
| parent | c1d6da652cbeb02bab615096866db60904632f63 (diff) | |
To prevent anyone else from stumbling on this (now) archaic bit of
history, nuke all mentions of XS_NO_CCB and the #define.
2006 - 2017. R.I.P.
ok kettenis@ inferred ok dlg@
Diffstat (limited to 'sys/scsi/cd.c')
| -rw-r--r-- | sys/scsi/cd.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index f1c3927bc73..ec2bd4479f5 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.219 2017/05/04 22:47:27 deraadt Exp $ */ +/* $OpenBSD: cd.c,v 1.220 2017/05/29 07:47:13 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -620,16 +620,6 @@ cd_buf_done(struct scsi_xfer *xs) bp->b_resid = xs->resid; break; - case XS_NO_CCB: - /* The adapter is busy, requeue the buf and try it later. */ - disk_unbusy(&sc->sc_dk, bp->b_bcount - xs->resid, bp->b_blkno, - bp->b_flags & B_READ); - bufq_requeue(&sc->sc_bufq, bp); - scsi_xs_put(xs); - SET(sc->sc_flags, CDF_WAITING); - timeout_add(&sc->sc_timeout, 1); - return; - case XS_SENSE: case XS_SHORTSENSE: #ifdef SCSIDEBUG |