summaryrefslogtreecommitdiff
path: root/sys/scsi/scsi_base.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-04-12 09:51:49 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-04-12 09:51:49 +0000
commit92c48865f5205b2178d91f1d1523d13de2be9d51 (patch)
tree744445513143bcb041f94961146990f376eda910 /sys/scsi/scsi_base.c
parentb3799e5c1782267f78506c4bd7678e409cfc4c5f (diff)
i snuck fine grained locking into the midlayer as part of all the
other stuff ive been doing in here. everything that needs protection inside the midlayer and the scsi device drivers (sd, cd, etc) uses mutexes now. this pushes splbio out of the midlayer. splbio is only taken before biodone is called now. ok beck@ marco@ krw@ deraadt@. theyre all terrified, but they all say if we're going to do then now is the right stage of the dev cycle.
Diffstat (limited to 'sys/scsi/scsi_base.c')
-rw-r--r--sys/scsi/scsi_base.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 939cc22d502..76277c7a874 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.168 2010/04/06 00:58:00 dlg Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.169 2010/04/12 09:51:48 dlg Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -1102,8 +1102,6 @@ scsi_xs_exec(struct scsi_xfer *xs)
void
scsi_done(struct scsi_xfer *xs)
{
- splassert(IPL_BIO);
-
#ifdef SCSIDEBUG
if (xs->sc_link->flags & SDEV_DB1) {
if (xs->datalen && (xs->flags & SCSI_DATA_IN))