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@

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index f1c3927..ec2bd44 100644 (file)
--- 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

diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 4396042..da7b851 100644 (file)
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: scsi_base.c,v 1.225 2016/09/15 02:00:18 dlg Exp $     */
+/*     $OpenBSD: scsi_base.c,v 1.226 2017/05/29 07:47:13 krw Exp $     */
 /*     $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $   */
 
 /*
@@ -1388,7 +1388,6 @@ scsi_xs_error(struct scsi_xfer *xs)
                    ("scsi_interpret_sense returned %#x\n", error));
                break;
 
-       case XS_NO_CCB:
        case XS_BUSY:
                error = scsi_delay(xs, 1);
                break;

diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index e90367a..b217ae7 100644 (file)
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: scsiconf.h,v 1.165 2017/05/19 08:31:43 sf Exp $       */
+/*     $OpenBSD: scsiconf.h,v 1.166 2017/05/29 07:47:13 krw Exp $      */
 /*     $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $    */
 
 /*
@@ -459,7 +459,6 @@ SIMPLEQ_HEAD(scsi_xfer_list, scsi_xfer);
 #define XS_BUSY                5       /* The device busy, try again later?      */
 #define XS_SHORTSENSE   6      /* Check the ATAPI sense for the error */
 #define XS_RESET       8       /* bus was reset; possible retry command  */
-#define XS_NO_CCB      9       /* device should requeue io and retry */
 
 /*
  * Possible retries for scsi_test_unit_ready()

diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index b964f80..bb93ca1 100644 (file)
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sd.c,v 1.270 2017/05/04 22:47:27 deraadt Exp $        */
+/*     $OpenBSD: sd.c,v 1.271 2017/05/29 07:47:13 krw Exp $    */
 /*     $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
 
 /*-
@@ -762,16 +762,6 @@ sd_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->flags, SDF_WAITING);
-               timeout_add(&sc->sc_timeout, 1);
-               return;
-
        case XS_SENSE:
        case XS_SHORTSENSE:
 #ifdef SCSIDEBUG

diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index df185d2..f311aa4 100644 (file)
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: st.c,v 1.132 2016/09/04 10:51:24 naddy Exp $  */
+/*     $OpenBSD: st.c,v 1.133 2017/05/29 07:47:13 krw Exp $    */
 /*     $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $  */
 
 /*
@@ -1047,7 +1047,6 @@ ststart(struct scsi_xfer *xs)
 void
 st_buf_done(struct scsi_xfer *xs)
 {
-       struct st_softc *st = xs->sc_link->device_softc;
        struct buf *bp = xs->cookie;
        int error, s;
 
@@ -1057,14 +1056,6 @@ st_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. */
-               bufq_requeue(&st->sc_bufq, bp);
-               scsi_xs_put(xs);
-               SET(st->flags, ST_WAITING); /* dont let ststart xsh_add */
-               timeout_add(&st->sc_timeout, 1);
-               return;
-
        case XS_SENSE:
        case XS_SHORTSENSE:
 #ifdef SCSIDEBUG