diff options
| author |   krw <krw@openbsd.org> | 2011-07-06 16:36:52 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2011-07-06 16:36:52 +0000 |
| commit | fa213d8c4f310adabd71eee569b023864d748c22 (patch) | |
| tree | 349afeb0f7673fe934f4e58c0ad86d8004eea21a /sys/kern/subr_disk.c | |
| parent | Remove a trailing \ from a comment which was hiding the altos3 entry (diff) | |
| download | wireguard-openbsd-fa213d8c4f310adabd71eee569b023864d748c22.tar.xz wireguard-openbsd-fa213d8c4f310adabd71eee569b023864d748c22.zip | |
On several archs (e.g. hppa, sgi, macppc) readdoslabel() is called after an attempt to
read a native label fails. Reset B_ERROR/b_error on buf to ensure any i/o failure on
that first attempt is forgiven. A la the dkcsum() fix to recover from a disk error.
Diffstat (limited to 'sys/kern/subr_disk.c')
| -rw-r--r-- | sys/kern/subr_disk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 9c41426adc4..f8ef8355de4 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.129 2011/07/06 04:49:36 matthew Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.130 2011/07/06 16:36:52 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -412,7 +412,8 @@ 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_READ | B_WRITE | B_DONE); + bp->b_error = 0; /* B_ERROR and b_error may have stale data. */ + CLR(bp->b_flags, B_READ | B_WRITE | B_DONE | B_ERROR); SET(bp->b_flags, B_BUSY | B_READ | B_RAW); (*strat)(bp); error = biowait(bp); |