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

Fix a bug in vfs_bio_clrbuf(). The single-page-clrbuf optimization was

Browse Source 
improperly clearing more then just the invalid portions of the page.  (This
bug is not known to have been triggered by anything).

Submitted by:	tegge
MFC after:	7 days
This commit is contained in:
dillon 2002-06-22 19:09:35 +00:00
parent 411b7ea1b5
commit 0af4a7d8da
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/kern/vfs_bio.c
View File

@ -3224,7 +3224,8 @@ vfs_bio_set_validclean(struct buf *bp, int base, int size)
*/
void
vfs_bio_clrbuf(struct buf *bp) {
vfs_bio_clrbuf(struct buf *bp)
{
int i, mask = 0;
caddr_t sa, ea;
@ -3236,13 +3237,17 @@ vfs_bio_clrbuf(struct buf *bp) {
if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) &&
(bp->b_offset & PAGE_MASK) == 0) {
mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1;
if (((bp->b_pages[0]->flags & PG_ZERO) == 0) &&
((bp->b_pages[0]->valid & mask) != mask)) {
bzero(bp->b_data, bp->b_bufsize);
if ((bp->b_pages[0]->valid & mask) == mask) {
bp->b_resid = 0;
return;
}
if (((bp->b_pages[0]->flags & PG_ZERO) == 0) &&
((bp->b_pages[0]->valid & mask) == 0)) {
bzero(bp->b_data, bp->b_bufsize);
bp->b_pages[0]->valid |= mask;
bp->b_resid = 0;
return;
}
bp->b_pages[0]->valid |= mask;
bp->b_resid = 0;
return;
}
ea = sa = bp->b_data;
for(i=0;i<bp->b_npages;i++,sa=ea) {