Module Name: src
Committed By: rmind
Date: Sat Apr 2 05:07:57 UTC 2011
Modified Files:
src/sys/kern: init_sysctl.c vfs_vnode.c
src/sys/sys: vnode.h
Log Message:
vfs_drainvnodes: drop lwp argument, remove variable name in prototype.
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.2 -r1.3 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.225 -r1.226 src/sys/sys/vnode.h
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/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.179 src/sys/kern/init_sysctl.c:1.180
--- src/sys/kern/init_sysctl.c:1.179 Sat Feb 5 01:22:12 2011
+++ src/sys/kern/init_sysctl.c Sat Apr 2 05:07:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.179 2011/02/05 01:22:12 christos Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.180 2011/04/02 05:07:57 rmind Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.179 2011/02/05 01:22:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.180 2011/04/02 05:07:57 rmind Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
@@ -989,7 +989,7 @@
old_vnodes = desiredvnodes;
desiredvnodes = new_vnodes;
if (new_vnodes < old_vnodes) {
- error = vfs_drainvnodes(new_vnodes, l);
+ error = vfs_drainvnodes(new_vnodes);
if (error) {
desiredvnodes = old_vnodes;
return (error);
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.2 src/sys/kern/vfs_vnode.c:1.3
--- src/sys/kern/vfs_vnode.c:1.2 Sat Apr 2 04:45:24 2011
+++ src/sys/kern/vfs_vnode.c Sat Apr 2 05:07:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.2 2011/04/02 04:45:24 rmind Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.3 2011/04/02 05:07:57 rmind Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.2 2011/04/02 04:45:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.3 2011/04/02 05:07:57 rmind Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1144,7 +1144,7 @@
}
int
-vfs_drainvnodes(long target, struct lwp *l)
+vfs_drainvnodes(long target)
{
while (numvnodes > target) {
@@ -1152,8 +1152,9 @@
mutex_enter(&vnode_free_list_lock);
vp = getcleanvnode();
- if (vp == NULL)
- return EBUSY; /* give up */
+ if (vp == NULL) {
+ return EBUSY;
+ }
ungetnewvnode(vp);
}
return 0;
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.225 src/sys/sys/vnode.h:1.226
--- src/sys/sys/vnode.h:1.225 Sat Apr 2 04:45:24 2011
+++ src/sys/sys/vnode.h Sat Apr 2 05:07:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.225 2011/04/02 04:45:24 rmind Exp $ */
+/* $NetBSD: vnode.h,v 1.226 2011/04/02 05:07:56 rmind Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -636,7 +636,7 @@
/* see vfssubr(9) */
void vfs_getnewfsid(struct mount *);
-int vfs_drainvnodes(long target, struct lwp *);
+int vfs_drainvnodes(long);
void vfs_timestamp(struct timespec *);
#if defined(DDB) || defined(DEBUGPRINT)
void vfs_vnode_print(struct vnode *, int, void (*)(const char *, ...));
