diff options
| -rw-r--r-- | sys/dev/pci/mpii.c | 5 | ||||
| -rw-r--r-- | sys/dev/vscsi.c | 3 | ||||
| -rw-r--r-- | sys/scsi/mpath.c | 3 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 7 |
4 files changed, 5 insertions, 13 deletions
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 33be7c9f717..7f602bce094 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.22 2010/06/27 01:47:36 dlg Exp $ */ +/* $OpenBSD: mpii.c,v 1.23 2010/06/27 03:34:29 matthew Exp $ */ /* * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru> * Copyright (c) 2009 James Giannoules @@ -4408,8 +4408,7 @@ mpii_scsi_cmd(struct scsi_xfer *xs) } DNPRINTF(MPII_D_CMD, "%s: mpii_scsi_cmd(): opcode: %02x " - "datalen: %d req_sense_len: %d\n", DEVNAME(sc), xs->cmd->opcode, - xs->datalen, xs->req_sense_length); + "datalen: %d\n", DEVNAME(sc), xs->cmd->opcode, xs->datalen); s = splbio(); mpii_start(sc, ccb); diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index 566beebdda6..5ad1613b481 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.12 2010/06/21 13:47:10 dlg Exp $ */ +/* $OpenBSD: vscsi.c,v 1.13 2010/06/27 03:34:29 matthew Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -398,7 +398,6 @@ vscsi_t2i(struct vscsi_softc *sc, struct vscsi_ioc_t2i *t2i) case VSCSI_STAT_SENSE: xs->error = XS_SENSE; bcopy(&t2i->sense, &xs->sense, sizeof(xs->sense)); - xs->req_sense_length = t2i->senselen; break; case VSCSI_STAT_ERR: default: diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c index 14390f624c3..bdd9eb9d5a7 100644 --- a/sys/scsi/mpath.c +++ b/sys/scsi/mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath.c,v 1.14 2010/05/20 00:55:18 krw Exp $ */ +/* $OpenBSD: mpath.c,v 1.15 2010/06/27 03:34:29 matthew Exp $ */ /* * Copyright (c) 2009 David Gwynne <dlg@openbsd.org> @@ -168,7 +168,6 @@ mpath_cmd(struct scsi_xfer *xs) mxs->datalen = xs->datalen; mxs->retries = xs->retries; mxs->timeout = xs->timeout; - mxs->req_sense_length = xs->req_sense_length; mxs->cookie = xs; mxs->done = mpath_done; diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 05563b69cca..6aef1f0888d 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.127 2010/06/15 04:11:34 dlg Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.128 2010/06/27 03:34:29 matthew Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -491,11 +491,6 @@ struct scsi_xfer { int error; /* an error value */ struct buf *bp; /* If we need to associate with a buf */ struct scsi_sense_data sense; /* 32 bytes*/ - /* - * Believe it or not, Some targets fall on the ground with - * anything but a certain sense length. - */ - int req_sense_length; /* Explicit request sense length */ u_int8_t status; /* SCSI status */ struct scsi_generic cmdstore; /* stash the command in here */ /* |