Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Add missing vfs_unbusy() call in error path of sysc...



details:   https://anonhg.NetBSD.org/src/rev/dde74fde5ed6
branches:  trunk
changeset: 749149:dde74fde5ed6
user:      enami <enami%NetBSD.org@localhost>
date:      Thu Nov 19 02:59:33 2009 +0000

description:
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.

diffstat:

 sys/kern/vfs_subr.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 0787f1b4d6e4 -r dde74fde5ed6 sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c       Thu Nov 19 02:52:54 2009 +0000
+++ b/sys/kern/vfs_subr.c       Thu Nov 19 02:59:33 2009 +0000
@@ -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);
                        }



Home | Main Index | Thread Index | Old Index