summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_diskmbr.c
diff options
context:
space:
mode:
authordyson <dyson@FreeBSD.org>1996-03-01 19:01:04 +0000
committerdyson <dyson@FreeBSD.org>1996-03-01 19:01:04 +0000
commit0d3859fc4832bd1d80625f81b97b1e37cc44bb93 (patch)
tree2d024ea1c506b42db3f4ed7e2046021f1f8d2caa /sys/kern/subr_diskmbr.c
parent2dac23e9f496bd5dc0a82b65d5a5767f36b77fb3 (diff)
downloadFreeBSD-src-0d3859fc4832bd1d80625f81b97b1e37cc44bb93.zip
FreeBSD-src-0d3859fc4832bd1d80625f81b97b1e37cc44bb93.tar.gz
Fix a bug that b_flags was getting unnecessarily modified by
the slice code. The effect up to now has been insignficant, but improved buffer allocation code will break with this problem.
Diffstat (limited to 'sys/kern/subr_diskmbr.c')
-rw-r--r--sys/kern/subr_diskmbr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 4cfd7ec..a19930c 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.16 1995/08/23 11:43:45 jkh Exp $
+ * $Id: diskslice_machdep.c,v 1.17 1995/10/28 15:38:55 phk Exp $
*/
#include <stddef.h>
@@ -221,7 +221,7 @@ reread_mbr:
if (bootverbose)
printf(
"%s: Found \"Ontrack Disk Manager\" on this disk.\n", sname);
- bp->b_flags = B_INVAL | B_AGE;
+ bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
mbr_offset = 63;
goto reread_mbr;
@@ -342,7 +342,7 @@ reread_mbr:
max_nsectors, max_ntracks, mbr_offset);
done:
- bp->b_flags = B_INVAL | B_AGE;
+ bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
if (error == EINVAL)
error = 0;
@@ -447,6 +447,6 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset,
mbr_offset);
done:
- bp->b_flags = B_INVAL | B_AGE;
+ bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
}
OpenPOWER on IntegriCloud