Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/fs/tmpfs Pull up following revision(s) (requested by ...
details: https://anonhg.NetBSD.org/src/rev/50e8bdc3f7ad
branches: netbsd-7
changeset: 799901:50e8bdc3f7ad
user: snj <snj%NetBSD.org@localhost>
date: Tue May 10 19:04:15 2016 +0000
description:
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
diffstat:
sys/fs/tmpfs/tmpfs_vnops.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (36 lines):
diff -r 30bdb9ab0585 -r 50e8bdc3f7ad sys/fs/tmpfs/tmpfs_vnops.c
--- a/sys/fs/tmpfs/tmpfs_vnops.c Tue May 10 09:10:11 2016 +0000
+++ b/sys/fs/tmpfs/tmpfs_vnops.c Tue May 10 19:04:15 2016 +0000
@@ -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 @@
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;
Home |
Main Index |
Thread Index |
Old Index