Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout revision 1.212 and add a comment that short-cutting the WAPBL 

case is not possible. The buffer length has changed and the rounded size
may not have, essentially changing the transaction size. Reported by
various users and in PR 39898.
This commit is contained in:
joerg 2008-11-16 19:34:19 +00:00
parent 99f68f2ca2
commit 92a83dd9cf
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/vfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_bio.c,v 1.213 2008/11/11 08:29:58 joerg Exp $ */ /* $NetBSD: vfs_bio.c,v 1.214 2008/11/16 19:34:19 joerg Exp $ */
/*- /*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@ -109,7 +109,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.213 2008/11/11 08:29:58 joerg Exp $"); __KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.214 2008/11/16 19:34:19 joerg Exp $");
#include "fs_ffs.h" #include "fs_ffs.h"
#include "opt_bufcache.h" #include "opt_bufcache.h"
@ -1267,8 +1267,14 @@ allocbuf(buf_t *bp, int size, int preserve)
bp->b_bcount = size; bp->b_bcount = size;
oldsize = bp->b_bufsize; oldsize = bp->b_bufsize;
if (oldsize == desired_size) if (oldsize == desired_size) {
return 0; /*
* Do not short cut the WAPBL resize, as the buffer length
* could still have changed and this would corrupt the
* tracking of the transaction length.
*/
goto out;
}
/* /*
* If we want a buffer of a different size, re-allocate the * If we want a buffer of a different size, re-allocate the
@ -1307,6 +1313,7 @@ allocbuf(buf_t *bp, int size, int preserve)
} }
mutex_exit(&bufcache_lock); mutex_exit(&bufcache_lock);
out:
if (wapbl_vphaswapbl(bp->b_vp)) if (wapbl_vphaswapbl(bp->b_vp))
WAPBL_RESIZE_BUF(wapbl_vptomp(bp->b_vp), bp, oldsize, oldcount); WAPBL_RESIZE_BUF(wapbl_vptomp(bp->b_vp), bp, oldsize, oldcount);