Module Name: src
Committed By: enami
Date: Thu Nov 19 02:59:34 UTC 2009
Modified Files:
src/sys/kern: vfs_subr.c
Log Message:
Add missing vfs_unbusy() call in error path of sysctl_kern_vnode().
This allows us to reboot machine successfully even if pstat -v fails once.
To generate a diff of this commit:
cvs rdiff -u -r1.387 -r1.388 src/sys/kern/vfs_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/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.387 src/sys/kern/vfs_subr.c:1.388
--- src/sys/kern/vfs_subr.c:1.387 Tue Nov 17 22:20:14 2009
+++ src/sys/kern/vfs_subr.c Thu Nov 19 02:59:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.387 2009/11/17 22:20:14 bouyer Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.388 2009/11/19 02:59:33 enami Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.387 2009/11/17 22:20:14 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.388 2009/11/19 02:59:33 enami Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -2208,6 +2208,7 @@
(void)vunmark(mvp);
mutex_exit(&mntvnode_lock);
vnfree(mvp);
+ vfs_unbusy(mp, false, NULL);
sysctl_relock();
*sizep = bp - where;
return (ENOMEM);
@@ -2220,6 +2221,7 @@
(void)vunmark(mvp);
mutex_exit(&mntvnode_lock);
vnfree(mvp);
+ vfs_unbusy(mp, false, NULL);
sysctl_relock();
return (error);
}
