Module Name: src
Committed By: hannken
Date: Sun Mar 20 12:21:28 UTC 2011
Modified Files:
src/sys/fs/msdosfs: msdosfs_denode.c msdosfs_vnops.c
Log Message:
When extending a file, either by truncating or by writing past EOF make
sure the unallocated remainder of the last page gets zeroed.
Detected by fsx.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.73 -r1.74 src/sys/fs/msdosfs/msdosfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_denode.c
diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.40 src/sys/fs/msdosfs/msdosfs_denode.c:1.41
--- src/sys/fs/msdosfs/msdosfs_denode.c:1.40 Wed Jul 21 17:52:10 2010
+++ src/sys/fs/msdosfs/msdosfs_denode.c Sun Mar 20 12:21:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.40 2010/07/21 17:52:10 hannken Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.41 2011/03/20 12:21:28 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.40 2010/07/21 17:52:10 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.41 2011/03/20 12:21:28 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -583,7 +583,7 @@
uvm_vnp_setwritesize(DETOV(dep), (voff_t)dep->de_FileSize);
dep->de_flag |= DE_UPDATE|DE_MODIFIED;
uvm_vnp_zerorange(DETOV(dep), (off_t)osize,
- (size_t)(dep->de_FileSize - osize));
+ (size_t)(round_page(dep->de_FileSize) - osize));
uvm_vnp_setsize(DETOV(dep), (voff_t)dep->de_FileSize);
return (deupdat(dep, 1));
}
Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.73 src/sys/fs/msdosfs/msdosfs_vnops.c:1.74
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.73 Sat Mar 19 20:05:21 2011
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Sun Mar 20 12:21:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.73 2011/03/19 20:05:21 hannken Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.74 2011/03/20 12:21:28 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.73 2011/03/19 20:05:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.74 2011/03/20 12:21:28 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -554,6 +554,7 @@
u_long count;
vsize_t bytelen;
off_t oldoff;
+ size_t rem;
struct uio *uio = ap->a_uio;
struct vnode *vp = ap->a_vp;
struct denode *dep = VTODE(vp);
@@ -623,6 +624,10 @@
dep->de_FileSize = uio->uio_offset + resid;
/* hint uvm to not read in extended part */
uvm_vnp_setwritesize(vp, dep->de_FileSize);
+ /* zero out the remainder of the last page */
+ rem = round_page(dep->de_FileSize) - dep->de_FileSize;
+ if (rem > 0)
+ uvm_vnp_zerorange(vp, (off_t)dep->de_FileSize, rem);
extended = 1;
}
