Thu Nov 19 02:59:34 2009 UTC ()

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.


(enami)

diff -r1.387 -r1.388 src/sys/kern/vfs_subr.c

--- src/sys/kern/vfs_subr.c 2009/11/17 22:20:14	1.387
+++ src/sys/kern/vfs_subr.c 2009/11/19 02:59:33	1.388

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -81,27 +81,27 @@
  * must be held.
  * To modify the VC_XLOCK bit, the interlock must be held.
  * We always keep the usecount (v_usecount & VC_MASK) non-zero while the
  * VC_XLOCK bit is set.
+ *
  * Unless the VC_XLOCK bit is set, changing the usecount from a non-zero
  * value to a non-zero value can safely be done using atomic operations,
  * without the interlock held.
  * Even if the VC_XLOCK bit is set, decreasing the usecount to a non-zero
  * value can be done using atomic operations, without the interlock held.
  */
 #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"
 #include "opt_compat_43.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 @@ -2198,38 +2198,40 @@ sysctl_kern_vnode(SYSCTLFN_ARGS)
 		for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
 			vmark(mvp, vp);
 			/*
 			 * Check that the vp is still associated with
 			 * this filesystem.  RACE: could have been
 			 * recycled onto the same filesystem.
 			 */
 			if (vp->v_mount != mp || vismarker(vp))
 				continue;
 			if (bp + VPTRSZ + VNODESZ > ewhere) {
 				(void)vunmark(mvp);
 				mutex_exit(&mntvnode_lock);
 				vnfree(mvp);
 				vfs_unbusy(mp, false, NULL);
 				sysctl_relock();
 				*sizep = bp - where;
 				return (ENOMEM);
+			}
 			memcpy(&vbuf, vp, VNODESZ);
 			mutex_exit(&mntvnode_lock);
 			if ((error = copyout(&vp, bp, VPTRSZ)) ||
 			   (error = copyout(&vbuf, bp + VPTRSZ, VNODESZ))) {
 			   	mutex_enter(&mntvnode_lock);
 				(void)vunmark(mvp);
 				mutex_exit(&mntvnode_lock);
 				vnfree(mvp);
 				vfs_unbusy(mp, false, NULL);
 				sysctl_relock();
 				return (error);
+			}
 			bp += VPTRSZ + VNODESZ;
 			mutex_enter(&mntvnode_lock);
+		}
 		mutex_exit(&mntvnode_lock);
 		vnfree(mvp);
 		vfs_unbusy(mp, false, &nmp);
+	}
 	mutex_exit(&mountlist_lock);
 	sysctl_relock();