Module Name: src
Committed By: snj
Date: Tue May 10 19:04:15 UTC 2016
Modified Files:
src/sys/fs/tmpfs [netbsd-7]: tmpfs_vnops.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1163):
sys/fs/tmpfs/tmpfs_vnops.c: revision 1.125
do not access uninitialized variables in KASSERTs - fixes build
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/fs/tmpfs/tmpfs_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/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.2 src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.3
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.120.2.2 Mon May 9 19:45:00 2016
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Tue May 10 19:04:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.120.2.2 2016/05/09 19:45:00 snj Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.120.2.3 2016/05/10 19:04:15 snj Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.120.2.2 2016/05/09 19:45:00 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.120.2.3 2016/05/10 19:04:15 snj Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -589,14 +589,14 @@ tmpfs_write(void *v)
KASSERT(VOP_ISLOCKED(vp));
+ node = VP_TO_TMPFS_NODE(vp);
+ oldsize = node->tn_size;
+
if ((vp->v_mount->mnt_flag & MNT_RDONLY) != 0) {
error = EROFS;
goto out;
}
- node = VP_TO_TMPFS_NODE(vp);
- oldsize = node->tn_size;
-
if (uio->uio_offset < 0 || vp->v_type != VREG) {
error = EINVAL;
goto out;
