diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-06-12 06:58:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-06-12 06:58:41 +0000 |
| commit | 750260e3bf10f2e3e7853d979f57c79e3d35d6f8 (patch) | |
| tree | 3e5546efc1642a2474331d40a68a26f1d607aba0 /sys/arch/hppa64 | |
| parent | 11ae183db4029474658e0aedf2d6e5ec178c148e (diff) | |
Bring biomem diff back into the tree after the nfs_bio.c fix went in.
ok thib beck art
Diffstat (limited to 'sys/arch/hppa64')
| -rw-r--r-- | sys/arch/hppa64/hppa64/disksubr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c index 8b72b8b47e2..31580f0c40f 100644 --- a/sys/arch/hppa64/hppa64/disksubr.c +++ b/sys/arch/hppa64/hppa64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.55 2008/06/11 12:35:41 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.56 2008/06/12 06:58:34 deraadt Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -107,7 +107,7 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), /* read LIF volume header */ bp->b_blkno = btodb(LIF_VOLSTART); bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ; + bp->b_flags = B_BUSY | B_READ | B_RAW; (*strat)(bp); if (biowait(bp)) return "LIF volume header I/O error"; @@ -122,7 +122,7 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), /* read LIF directory */ dbp->b_blkno = lifstodb(lvp->vol_addr); dbp->b_bcount = lp->d_secsize; - dbp->b_flags = B_BUSY | B_READ; + dbp->b_flags = B_BUSY | B_READ | B_RAW; (*strat)(dbp); if (biowait(dbp)) { @@ -154,7 +154,7 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), /* read LIF directory */ dbp->b_blkno = lifstodb(p->dir_addr); dbp->b_bcount = lp->d_secsize; - dbp->b_flags = B_BUSY | B_READ; + dbp->b_flags = B_BUSY | B_READ | B_RAW; (*strat)(dbp); if (biowait(dbp)) { @@ -218,7 +218,7 @@ finished: bp->b_blkno = fsoff + LABELSECTOR; bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ; + bp->b_flags = B_BUSY | B_READ | B_RAW; (*strat)(bp); /* if successful, locate disk label within block and validate */ @@ -258,14 +258,14 @@ 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; + 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; + bp->b_flags = B_BUSY | B_WRITE | B_RAW; (*strat)(bp); error = biowait(bp); |