From b55adffee3e9eac093849e4a593aa8e1c3798bef Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Wed, 22 Oct 2008 12:29:35 +0000
Subject: [PATCH] Don't need nfs_vfs_reinit anymore since we don't resize
 tables anymore. Move reinit code to init case.

---
 sys/nfs/nfs_node.c   |  6 +++---
 sys/nfs/nfs_subs.c   | 11 +++--------
 sys/nfs/nfs_var.h    |  4 ++--
 sys/nfs/nfs_vfsops.c |  6 +++---
 sys/nfs/nfsmount.h   |  3 +--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 1e87049086f9..5345c89b679a 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_node.c,v 1.105 2008/10/22 11:36:06 matt Exp $	*/
+/*	$NetBSD: nfs_node.c,v 1.106 2008/10/22 12:29:35 matt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.105 2008/10/22 11:36:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_node.c,v 1.106 2008/10/22 12:29:35 matt Exp $");
 
 #include "opt_nfs.h"
 
@@ -79,7 +79,7 @@ static const struct genfs_ops nfs_genfsops = {
  * Reinitialize inode hash table.
  */
 void
-nfs_node_reinit()
+nfs_node_init()
 {
 	malloc_type_attach(M_NFSNODE);
 	pool_init(&nfs_node_pool, sizeof(struct nfsnode), 0, 0, 0, "nfsnodepl",
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 31d4699bb751..2e32051179b0 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_subs.c,v 1.208 2008/10/22 11:36:06 matt Exp $	*/
+/*	$NetBSD: nfs_subs.c,v 1.209 2008/10/22 12:29:35 matt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.208 2008/10/22 11:36:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.209 2008/10/22 12:29:35 matt Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfs.h"
@@ -1590,16 +1590,11 @@ nfs_vfs_init()
 
 	/* Initialize NFS server / client shared data. */
 	nfs_init();
+	nfs_node_init();
 
 	nfs_commitsize = uvmexp.npages << (PAGE_SHIFT - 4);
 }
 
-void
-nfs_vfs_reinit()
-{
-	nfs_node_reinit();
-}
-
 void
 nfs_vfs_done()
 {
diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index a5a3887b4f0a..6db95946b995 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_var.h,v 1.81 2008/10/22 11:36:06 matt Exp $	*/
+/*	$NetBSD: nfs_var.h,v 1.82 2008/10/22 12:29:35 matt Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@ void nfs_kqinit(void);
 
 /* nfs_node.c */
 void nfs_rbtinit(struct nfsmount *);
-void nfs_node_reinit(void);
+void nfs_node_init(void);
 void nfs_node_done(void);
 
 int nfs_nget1(struct mount *, nfsfh_t *, int, struct nfsnode **, int);
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 344db1f279e8..4131906cf36d 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vfsops.c,v 1.202 2008/10/22 11:36:06 matt Exp $	*/
+/*	$NetBSD: nfs_vfsops.c,v 1.203 2008/10/22 12:29:35 matt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.202 2008/10/22 11:36:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.203 2008/10/22 12:29:35 matt Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -116,7 +116,7 @@ struct vfsops nfs_vfsops = {
 	nfs_fhtovp,
 	nfs_vptofh,
 	nfs_vfs_init,
-	nfs_vfs_reinit,
+	NULL,
 	nfs_vfs_done,
 	nfs_mountroot,
 	(int (*)(struct mount *, struct vnode *, struct timespec *)) eopnotsupp,
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 9eff52d810ac..6c8f890f02d5 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfsmount.h,v 1.47 2008/10/22 11:36:06 matt Exp $	*/
+/*	$NetBSD: nfsmount.h,v 1.48 2008/10/22 12:29:35 matt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -197,7 +197,6 @@ int	nfs_fsinfo __P((struct nfsmount *, struct vnode *, kauth_cred_t,
 			struct lwp *));
 
 void	nfs_vfs_init __P((void));
-void	nfs_vfs_reinit __P((void));
 void	nfs_vfs_done __P((void));
 
 #endif /* _KERNEL */