diff options
| author | John Dyson <dyson@FreeBSD.org> | 1996-03-02 01:49:51 +0000 |
|---|---|---|
| committer | John Dyson <dyson@FreeBSD.org> | 1996-03-02 01:49:51 +0000 |
| commit | 33309c7fc0044a15212dbd6588b84d97a599ab08 (patch) | |
| tree | 4f35277cccd5201e94d4e00e066e11e67a32e3f0 /sys/kern | |
| parent | d52b14d7692556f11e0d81f0081cdb87d99bcdd3 (diff) | |
Notes
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_disklabel.c | 8 | ||||
| -rw-r--r-- | sys/kern/subr_diskmbr.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c index 5bdf97562e08..ee889405c371 100644 --- a/sys/kern/subr_disklabel.c +++ b/sys/kern/subr_disklabel.c @@ -254,7 +254,7 @@ readdisklabel(dev, strat, lp) bp->b_dev = dev; bp->b_blkno = LABELSECTOR; bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ; + bp->b_flags |= B_BUSY | B_READ; bp->b_cylinder = LABELSECTOR / lp->d_secpercyl; (*strat)(bp); if (biowait(bp)) @@ -363,7 +363,7 @@ writedisklabel(dev, strat, lp) * Note that you can't write a label out over a corrupted label! * (also stupid.. how do you write the first one? by raw writes?) */ - bp->b_flags = B_BUSY | B_READ; + bp->b_flags |= B_BUSY | B_READ; (*strat)(bp); error = biowait(bp); if (error) @@ -375,7 +375,7 @@ writedisklabel(dev, strat, lp) if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC && dkcksum(dlp) == 0) { *dlp = *lp; - bp->b_flags = B_BUSY | B_WRITE; + bp->b_flags |= B_BUSY | B_WRITE; (*strat)(bp); error = biowait(bp); goto done; @@ -387,7 +387,7 @@ done: bzero(bp->b_data, lp->d_secsize); dlp = (struct disklabel *)bp->b_data; *dlp = *lp; - bp->b_flags = B_BUSY | B_WRITE; + bp->b_flags |= B_BUSY | B_WRITE; (*strat)(bp); error = biowait(bp); #endif diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index a19930c9afa9..481cef14f473 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.17 1995/10/28 15:38:55 phk Exp $ + * $Id: diskslice_machdep.c,v 1.18 1996/03/01 19:00:53 dyson Exp $ */ #include <stddef.h> @@ -193,7 +193,7 @@ reread_mbr: bp->b_dev = dkmodpart(dkmodslice(dev, WHOLE_DISK_SLICE), RAW_PART); bp->b_blkno = mbr_offset; bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ; + bp->b_flags |= B_BUSY | B_READ; (*strat)(bp); if (biowait(bp) != 0) { diskerr(bp, dname, "error reading primary partition table", @@ -380,7 +380,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, bp->b_dev = dev; bp->b_blkno = ext_offset; bp->b_bcount = lp->d_secsize; - bp->b_flags = B_BUSY | B_READ; + bp->b_flags |= B_BUSY | B_READ; (*strat)(bp); if (biowait(bp) != 0) { diskerr(bp, dname, "error reading extended partition table", |