From 5af5d78d1338b0c4709985e75d6a36132d6c2ac5 Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Sat, 16 Apr 2011 03:21:17 +0000 Subject: Use 'CLR(->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@. --- sys/arch/loongson/loongson/disksubr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/arch/loongson') diff --git a/sys/arch/loongson/loongson/disksubr.c b/sys/arch/loongson/loongson/disksubr.c index 0c7d05c0483..89a6f23d74a 100644 --- a/sys/arch/loongson/loongson/disksubr.c +++ b/sys/arch/loongson/loongson/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.4 2011/04/15 14:57:28 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.5 2011/04/16 03:21:15 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -110,7 +110,7 @@ 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; - 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 ((error = biowait(bp)) != 0) @@ -118,7 +118,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp) dlp = (struct disklabel *)(bp->b_data + LABELOFFSET); *dlp = *lp; - 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); -- cgit v1.2.3