Module Name: src Committed By: riz Date: Sun Nov 8 01:26:56 UTC 2015
Modified Files: src/sys/fs/tmpfs [netbsd-7]: tmpfs_subr.c Log Message: Pull up following revision(s) (requested by leot in ticket #1023): sys/fs/tmpfs/tmpfs_subr.c: revision 1.101 Make sure that nde->td_node is NULL for asserts. Thanks and from Mindaugas Rasiukevicius. Fixes PR kern/50381. To generate a diff of this commit: cvs rdiff -u -r1.96.4.1 -r1.96.4.2 src/sys/fs/tmpfs/tmpfs_subr.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_subr.c diff -u src/sys/fs/tmpfs/tmpfs_subr.c:1.96.4.1 src/sys/fs/tmpfs/tmpfs_subr.c:1.96.4.2 --- src/sys/fs/tmpfs/tmpfs_subr.c:1.96.4.1 Mon Dec 22 02:05:08 2014 +++ src/sys/fs/tmpfs/tmpfs_subr.c Sun Nov 8 01:26:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_subr.c,v 1.96.4.1 2014/12/22 02:05:08 msaitoh Exp $ */ +/* $NetBSD: tmpfs_subr.c,v 1.96.4.2 2015/11/08 01:26:56 riz Exp $ */ /* * Copyright (c) 2005-2013 The NetBSD Foundation, Inc. @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.96.4.1 2014/12/22 02:05:08 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.96.4.2 2015/11/08 01:26:56 riz Exp $"); #include <sys/param.h> #include <sys/cprng.h> @@ -451,6 +451,7 @@ tmpfs_alloc_dirent(tmpfs_mount_t *tmp, c nde->td_namelen = len; memcpy(nde->td_name, name, len); nde->td_seq = TMPFS_DIRSEQ_NONE; + nde->td_node = NULL; /* for asserts */ *de = nde; return 0;