From c713a7721e58dd0a453fae998afd21f12fd821e8 Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Thu, 20 May 2010 00:55:19 +0000 Subject: 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@ --- sys/dev/i2o/iopsp.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'sys/dev/i2o') diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c index 18388d9ce77..2572fcfd808 100644 --- a/sys/dev/i2o/iopsp.c +++ b/sys/dev/i2o/iopsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iopsp.c,v 1.16 2010/03/23 01:57:19 krw Exp $ */ +/* $OpenBSD: iopsp.c,v 1.17 2010/05/20 00:55:17 krw Exp $ */ /* $NetBSD$ */ /*- @@ -419,9 +419,7 @@ iopsp_scsi_cmd(xs) tid = IOPSP_TIDMAP(sc->sc_tidmap, link->target, link->lun); if (tid == IOPSP_TID_ABSENT || tid == IOPSP_TID_INUSE) { xs->error = XS_SELTIMEOUT; - s = splbio(); scsi_done(xs); - splx(s); return; } @@ -439,9 +437,7 @@ iopsp_scsi_cmd(xs) } else xs->error = XS_NOERROR; - s = splbio(); scsi_done(xs); - splx(s); return; } @@ -486,9 +482,7 @@ iopsp_scsi_cmd(xs) if (error) { xs->error = XS_DRIVER_STUFFUP; iop_msg_free(iop, im); - s = splbio(); scsi_done(xs); - splx(s); return; } if ((xs->flags & SCSI_DATA_IN) == 0) @@ -509,9 +503,7 @@ iopsp_scsi_cmd(xs) iop_msg_unmap(iop, im); iop_msg_free(iop, im); xs->error = XS_DRIVER_STUFFUP; - s = splbio(); scsi_done(xs); - splx(s); } } -- cgit v1.2.3