diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-04-15 14:57:30 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-04-15 14:57:30 +0000 |
| commit | b4beef39345d1dbe85f71c6935ff2742c4b8a5b8 (patch) | |
| tree | 9e953ccf05e5ba2fbe93b2d58c5fdb2fa680cafb /sys/arch/octeon | |
| parent | 333e7f4bad1ad8fde2bfadcf79001104562ccc74 (diff) | |
In days of yore one could arbitrarily whack buffer flags. Those days
are past. Use CLR() and SET() to modify necessary flags while leaving
the flags used by the buffer cache in peace.
Should make bufcache code much less confused about the state of the
bufs used in reading/writing disklabels. Other such flag abuses no
doubt await a visit.
Errors in original diff found by miod@.
ok beck@ deraadt@
Diffstat (limited to 'sys/arch/octeon')
| -rw-r--r-- | sys/arch/octeon/octeon/disksubr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/octeon/octeon/disksubr.c b/sys/arch/octeon/octeon/disksubr.c index 30ecf5b5fb2..45380b2089a 100644 --- a/sys/arch/octeon/octeon/disksubr.c +++ b/sys/arch/octeon/octeon/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.3 2011/04/06 13:46:50 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.4 2011/04/15 14:57:29 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -110,14 +110,16 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp) /* Read it in, slap the new label in, and write it back out */ bp->b_blkno = partoff + LABELSECTOR; bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ | B_RAW; + CLR(bp->b_flags, B_WRITE | B_DONE); + SET(bp->b_flags, B_BUSY | B_READ | B_RAW); (*strat)(bp); if ((error = biowait(bp)) != 0) goto done; dlp = (struct disklabel *)(bp->b_data + LABELOFFSET); *dlp = *lp; - bp->b_flags = B_BUSY | B_WRITE | B_RAW; + CLR(bp->b_flags, B_READ | B_DONE); + SET(bp->b_flags, B_BUSY | B_WRITE | B_RAW); (*strat)(bp); error = biowait(bp); |