From 74ca9fa64fc4d557c1bb68219055cbe15e83f9c5 Mon Sep 17 00:00:00 2001 From: David Greenman Date: Mon, 7 Aug 1995 14:20:27 +0000 Subject: [PATCH] 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. --- sys/kern/subr_disklabel.c | 6 +----- sys/ufs/ufs/ufs_disksubr.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index c1d1f569d2c..828776fca00 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 @@ -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); } /* diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c index c1d1f569d2c..828776fca00 100644 --- a/sys/ufs/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs/ufs_disksubr.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 @@ -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); } /*