summaryrefslogtreecommitdiff
path: root/sys/arch/sparc
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-04-16 03:21:17 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-04-16 03:21:17 +0000
commit5af5d78d1338b0c4709985e75d6a36132d6c2ac5 (patch)
tree06204a0001ec3bd364dcad84343781986e7366ec /sys/arch/sparc
parent4756385e9b648975c08e5d54adb8d4ac7ce047f2 (diff)
Use 'CLR(<buf>->b_flags, B_READ | B_WRITE | B_DONE)' regardless of
what the previous IO was. Less chance of copy and paste errors. Suggested by miod@.
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r--sys/arch/sparc/sparc/disksubr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index 0cab0c066c3..ee6d16920ee 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.89 2011/04/15 14:57:29 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.90 2011/04/16 03:21:15 krw Exp $ */
/* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
/*
@@ -102,7 +102,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
bp->b_blkno = LABELSECTOR;
bp->b_bcount = lp->d_secsize;
- CLR(bp->b_flags, B_WRITE | B_DONE);
+ CLR(bp->b_flags, B_READ | B_WRITE | B_DONE);
SET(bp->b_flags, B_BUSY | B_READ | B_RAW);
(*strat)(bp);
if (biowait(bp)) {
@@ -166,7 +166,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp)
/* Write out the updated label. */
bp->b_blkno = LABELSECTOR;
bp->b_bcount = lp->d_secsize;
- CLR(bp->b_flags, B_READ | B_DONE);
+ CLR(bp->b_flags, B_READ | B_WRITE | B_DONE);
SET(bp->b_flags, B_BUSY | B_WRITE | B_RAW);
(*strat)(bp);
error = biowait(bp);