diff options
| author |   krw <krw@openbsd.org> | 2011-04-16 03:21:15 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2011-04-16 03:21:15 +0000 |
| commit | 0189133d1d472f6304d87e29d3d8b78385df7e20 (patch) | |
| tree | d96473a788181549f030acabe8bb4bfe9162190e /sys/kern/subr_disk.c | |
| parent | Initialize variables before use. (diff) | |
| download | wireguard-openbsd-0189133d1d472f6304d87e29d3d8b78385df7e20.tar.xz wireguard-openbsd-0189133d1d472f6304d87e29d3d8b78385df7e20.zip | |
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/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index d9ccb8a229d..a488b3c7842 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.118 2011/04/15 14:57:29 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.119 2011/04/16 03:21:16 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -410,7 +410,7 @@ readdoslabel(struct buf *bp, void (*strat)(struct buf *), bp->b_blkno = DL_BLKTOSEC(lp, part_blkno) * DL_BLKSPERSEC(lp); offset = DL_BLKOFFSET(lp, part_blkno) + DOSPARTOFF; 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); error = biowait(bp); @@ -596,7 +596,7 @@ notfat: DL_BLKSPERSEC(lp); offset = DL_BLKOFFSET(lp, dospartoff + DOS_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)) |