Module Name: src
Committed By: kardel
Date: Sat Mar 12 10:51:01 UTC 2016
Modified Files:
src/sys/fs/tmpfs: tmpfs_vnops.c
Log Message:
do no access uninitialized variables in KASSERTs - fixes build
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 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.124 src/sys/fs/tmpfs/tmpfs_vnops.c:1.125
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.124 Sat Mar 12 08:51:13 2016
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Sat Mar 12 10:51:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.124 2016/03/12 08:51:13 joerg Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.125 2016/03/12 10:51:00 kardel 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.124 2016/03/12 08:51:13 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.125 2016/03/12 10:51:00 kardel Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -572,14 +572,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;
