diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-05-20 00:55:19 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-05-20 00:55:19 +0000 |
| commit | c713a7721e58dd0a453fae998afd21f12fd821e8 (patch) | |
| tree | 4c794ea604130c88f12d5a7295bcd0cb4624515f /sys/dev/vscsi.c | |
| parent | 3c3718e53ebd6b33568092f43f11f6f1d0c4130e (diff) | |
New scsi code seems to be stable. Pluck previously identified
low-hanging splbio/splx pairs that are no longer needed and see if
this reveals any hidden scsi flaws.
ok dlg@
Diffstat (limited to 'sys/dev/vscsi.c')
| -rw-r--r-- | sys/dev/vscsi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index 739bfc61b1e..bf45052df41 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.8 2010/03/23 01:57:19 krw Exp $ */ +/* $OpenBSD: vscsi.c,v 1.9 2010/05/20 00:55:17 krw Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -207,12 +207,8 @@ vscsi_cmd(struct scsi_xfer *xs) void vscsi_xs_stuffup(struct scsi_xfer *xs) { - int s; - xs->error = XS_DRIVER_STUFFUP; - s = splbio(); scsi_done(xs); - splx(s); } int @@ -392,7 +388,6 @@ vscsi_t2i(struct vscsi_softc *sc, struct vscsi_ioc_t2i *t2i) struct scsi_link *link; int rv = 0; int polled; - int s; TAILQ_FOREACH(ccb, &sc->sc_ccb_t2i, ccb_entry) { if (ccb->ccb_tag == t2i->tag) @@ -426,9 +421,7 @@ vscsi_t2i(struct vscsi_softc *sc, struct vscsi_ioc_t2i *t2i) polled = ISSET(xs->flags, SCSI_POLL); - s = splbio(); scsi_done(xs); - splx(s); if (polled) { ccb->ccb_xs = NULL; |