summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_disklabel.c
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1995-08-07 14:20:27 +0000
committerdg <dg@FreeBSD.org>1995-08-07 14:20:27 +0000
commit99714b736d445ebad2508906882cfd04875505c9 (patch)
tree9c94034701f52140482f3eecdee657dd251e6902 /sys/kern/subr_disklabel.c
parentdbe2664bebe6046f3c141140ba6364833dc5209c (diff)
downloadFreeBSD-src-99714b736d445ebad2508906882cfd04875505c9.zip
FreeBSD-src-99714b736d445ebad2508906882cfd04875505c9.tar.gz
On closer inspection, it turns out that all of the callers of disksort
are already at splbio()...so back out the last change to disksort.
Diffstat (limited to 'sys/kern/subr_disklabel.c')
-rw-r--r--sys/kern/subr_disklabel.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index c1d1f56..828776f 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -42,7 +42,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.15 1995/05/30 08:15:33 rgrimes Exp $
+ * $Id: ufs_disksubr.c,v 1.16 1995/08/07 11:55:32 davidg Exp $
*/
#include <sys/param.h>
@@ -80,14 +80,11 @@ disksort(ap, bp)
register struct buf *ap, *bp;
{
register struct buf *bq;
- int s;
- s = splbio();
/* If the queue is empty, then it's easy. */
if (ap->b_actf == NULL) {
bp->b_actf = NULL;
ap->b_actf = bp;
- splx(s);
return;
}
@@ -148,7 +145,6 @@ disksort(ap, bp)
insert:
bp->b_actf = bq->b_actf;
bq->b_actf = bp;
- splx(s);
}
/*
OpenPOWER on IntegriCloud