CVS commit: [netbsd-7] src/sys/kern

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Fri Jan  9 14:50:35 UTC 2015

Modified Files:
        src/sys/kern [netbsd-7]: vfs_mount.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #398):
        sys/kern/vfs_mount.c: revision 1.32
vfs_vnode_iterator_destroy: set v_usecount of marker to zero to prevent
an assertion from vnfree().


To generate a diff of this commit:
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/kern/vfs_mount.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/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.30.2.1 src/sys/kern/vfs_mount.c:1.30.2.2
--- src/sys/kern/vfs_mount.c:1.30.2.1	Tue Nov 18 18:40:06 2014
+++ src/sys/kern/vfs_mount.c	Fri Jan  9 14:50:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_mount.c,v 1.30.2.1 2014/11/18 18:40:06 snj Exp $	*/
+/*	$NetBSD: vfs_mount.c,v 1.30.2.2 2015/01/09 14:50:35 martin Exp $	*/
 
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.30.2.1 2014/11/18 18:40:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.30.2.2 2015/01/09 14:50:35 martin Exp $");
 
 #define _VFS_VNODE_PRIVATE
 
@@ -365,8 +365,10 @@ vfs_vnode_iterator_destroy(struct vnode_
 
 	mutex_enter(&mntvnode_lock);
 	KASSERT(ISSET(mvp->v_iflag, VI_MARKER));
-	if (mvp->v_usecount != 0)
+	if (mvp->v_usecount != 0) {
 		TAILQ_REMOVE(&mvp->v_mount->mnt_vnodelist, mvp, v_mntvnodes);
+		mvp->v_usecount = 0;
+	}
 	mutex_exit(&mntvnode_lock);
 	vnfree(mvp);
 }