diff options
| author | mckusick <mckusick@FreeBSD.org> | 1999-06-26 02:47:16 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 1999-06-26 02:47:16 +0000 |
| commit | 5b58f2f951911f1075788268f99efccf1dba60eb (patch) | |
| tree | 3f01ed42f71231eaa6a8cfa08b267634f1923fb1 /sys/kern/subr_disklabel.c | |
| parent | 3213b13650cb2206bbd62b5b1764d148750f63a0 (diff) | |
| download | FreeBSD-src-5b58f2f951911f1075788268f99efccf1dba60eb.zip FreeBSD-src-5b58f2f951911f1075788268f99efccf1dba60eb.tar.gz | |
Convert buffer locking from using the B_BUSY and B_WANTED flags to using
lockmgr locks. This commit should be functionally equivalent to the old
semantics. That is, all buffer locking is done with LK_EXCLUSIVE
requests. Changes to take advantage of LK_SHARED and LK_RECURSIVE will
be done in future commits.
Diffstat (limited to 'sys/kern/subr_disklabel.c')
| -rw-r--r-- | sys/kern/subr_disklabel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index 33f1d2a..21088cb 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94 - * $Id: ufs_disksubr.c,v 1.38 1998/10/17 07:49:04 bde Exp $ + * $Id: ufs_disksubr.c,v 1.39 1998/12/14 05:37:37 dillon Exp $ */ #include <sys/param.h> @@ -182,7 +182,7 @@ readdisklabel(dev, strat, lp) bp->b_blkno = LABELSECTOR * ((int)lp->d_secsize/DEV_BSIZE); bp->b_bcount = lp->d_secsize; bp->b_flags &= ~B_INVAL; - bp->b_flags |= B_BUSY | B_READ; + bp->b_flags |= B_READ; (*strat)(bp); if (biowait(bp)) msg = "I/O error"; @@ -286,7 +286,7 @@ writedisklabel(dev, strat, lp) * (also stupid.. how do you write the first one? by raw writes?) */ bp->b_flags &= ~B_INVAL; - bp->b_flags |= B_BUSY | B_READ; + bp->b_flags |= B_READ; (*strat)(bp); error = biowait(bp); if (error) @@ -299,7 +299,7 @@ writedisklabel(dev, strat, lp) dkcksum(dlp) == 0) { *dlp = *lp; bp->b_flags &= ~(B_DONE | B_READ); - bp->b_flags |= B_BUSY | B_WRITE; + bp->b_flags |= B_WRITE; #ifdef __alpha__ alpha_fix_srm_checksum(bp); #endif @@ -315,7 +315,7 @@ done: dlp = (struct disklabel *)bp->b_data; *dlp = *lp; bp->b_flags &= ~B_INVAL; - bp->b_flags |= B_BUSY | B_WRITE; + bp->b_flags |= B_WRITE; (*strat)(bp); error = biowait(bp); #endif |
