d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug that b_flags was getting unnecessarily modified by

Browse Source 
the slice code.  The effect up to now has been insignficant, but
improved buffer allocation code will break with this problem.
This commit is contained in:
dyson 1996-03-01 19:01:04 +00:00
parent 2dac23e9f4
commit 0d3859fc48
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/i386/isa/diskslice_machdep.c
View File

@ -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);
}

6
sys/kern/subr_disklabel.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
* $Id: ufs_disksubr.c,v 1.19 1995/09/16 17:04:06 bde Exp $
* $Id: ufs_disksubr.c,v 1.20 1995/11/23 07:24:32 dyson Exp $
*/
#include <sys/param.h>
@ -275,7 +275,7 @@ readdisklabel(dev, strat, lp)
break;
}
}
bp->b_flags = B_INVAL | B_AGE;
bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
return (msg);
}
@ -391,7 +391,7 @@ done:
(*strat)(bp);
error = biowait(bp);
#endif
bp->b_flags = B_INVAL | B_AGE;
bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
return (error);
}

8
sys/kern/subr_diskmbr.c
View File

@ -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);
}

2
sys/kern/subr_dkbad.c
View File

@ -132,7 +132,7 @@ readbad144(dev, strat, lp, bdp)
msg = "bad sector table I/O error";
} while ((bp->b_flags & B_ERROR) && (i += 2) < 10 &&
i < lp->d_nsectors);
bp->b_flags = B_INVAL | B_AGE;
bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
return (msg);
}

6
sys/ufs/ufs/ufs_disksubr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
* $Id: ufs_disksubr.c,v 1.19 1995/09/16 17:04:06 bde Exp $
* $Id: ufs_disksubr.c,v 1.20 1995/11/23 07:24:32 dyson Exp $
*/
#include <sys/param.h>
@ -275,7 +275,7 @@ readdisklabel(dev, strat, lp)
break;
}
}
bp->b_flags = B_INVAL | B_AGE;
bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
return (msg);
}
@ -391,7 +391,7 @@ done:
(*strat)(bp);
error = biowait(bp);
#endif
bp->b_flags = B_INVAL | B_AGE;
bp->b_flags |= B_INVAL | B_AGE;
brelse(bp);
return (error);
}