Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/nfs/nfs_var.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/nfs/nfs_var.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.79
retrieving revision 1.79.6.2
diff -u -p -r1.79 -r1.79.6.2
--- src/sys/nfs/nfs_var.h	2008/04/28 20:24:10	1.79
+++ src/sys/nfs/nfs_var.h	2008/12/13 01:15:28	1.79.6.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_var.h,v 1.79 2008/04/28 20:24:10 martin Exp $	*/
+/*	$NetBSD: nfs_var.h,v 1.79.6.2 2008/12/13 01:15:28 haad Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,9 +37,6 @@
 #include <sys/mallocvar.h>
 #include <sys/pool.h>
 
-MALLOC_DECLARE(M_NFSD);
-MALLOC_DECLARE(M_NFSDIROFF);
-
 struct vnode;
 struct uio;
 struct proc;
@@ -80,11 +77,13 @@ int nfs_doio(struct buf *);
 
 /* nfs_kq.c */
 void nfs_kqinit(void);
+void nfs_kqfini(void);
 
 /* nfs_node.c */
-void nfs_nhinit(void);
-void nfs_nhreinit(void);
-void nfs_nhdone(void);
+void nfs_rbtinit(struct nfsmount *);
+void nfs_node_init(void);
+void nfs_node_done(void);
+
 int nfs_nget1(struct mount *, nfsfh_t *, int, struct nfsnode **, int);
 #define	nfs_nget(mp, fhp, fhsize, npp) \
 	nfs_nget1((mp), (fhp), (fhsize), (npp), 0)
@@ -177,7 +176,10 @@ int nfs_rephead(int, struct nfsrv_descri
 	int, int, u_quad_t *, struct mbuf **, struct mbuf **, char **);
 void nfs_timer(void *);
 void nfs_timer_init(void);
+void nfs_timer_fini(void);
 void nfs_timer_start(void);
+void nfs_timer_srvinit(bool (*)(void));
+void nfs_timer_srvfini(void);
 int nfs_sigintr(struct nfsmount *, struct nfsreq *, struct lwp *);
 int nfs_getreq(struct nfsrv_descript *, struct nfsd *, int);
 int nfs_msg(struct lwp *, const char *, const char *);
@@ -192,8 +194,10 @@ void nfsdsock_unlock(struct nfssvc_sock 
 int nfsdsock_drain(struct nfssvc_sock *);
 int nfsdsock_sendreply(struct nfssvc_sock *, struct nfsrv_descript *);
 void nfsdreq_init(void);
+void nfsdreq_fini(void);
 struct nfsrv_descript *nfsdreq_alloc(void);
 void nfsdreq_free(struct nfsrv_descript *);
+bool nfsrv_timer(void);
 
 void nfsdsock_setbits(struct nfssvc_sock *, int);
 void nfsdsock_clearbits(struct nfssvc_sock *, int);
@@ -201,6 +205,7 @@ bool nfsdsock_testbits(struct nfssvc_soc
 
 /* nfs_srvcache.c */
 void nfsrv_initcache(void);
+void nfsrv_finicache(void);
 int nfsrv_getcache(struct nfsrv_descript *, struct nfssvc_sock *,
 	struct mbuf **);
 void nfsrv_updatecache(struct nfsrv_descript *, int, struct mbuf *);
@@ -225,7 +230,8 @@ void nfs_putdircache(struct nfsnode *, s
 void nfs_invaldircache(struct vnode *, int);
 #define	NFS_INVALDIRCACHE_FORCE		1
 #define	NFS_INVALDIRCACHE_KEEPEOF	2
-void nfs_init __P((void));
+void nfs_init(void);
+void nfs_fini(void);
 int nfsm_loadattrcache(struct vnode **, struct mbuf **, char **,
 	struct vattr *, int flags);
 int nfs_loadattrcache(struct vnode **, struct nfs_fattr *, struct vattr *,
@@ -281,7 +287,9 @@ int nfssvc_nfsd(struct nfsd_srvargs *, v
 void nfsrv_zapsock(struct nfssvc_sock *);
 void nfsrv_slpderef(struct nfssvc_sock *);
 void nfsrv_init(int);
+void nfsrv_fini(void);
 void nfs_iodinit(void);
+void nfs_iodfini(void);
 int nfs_set_niothreads(int);
 int nfs_getauth(struct nfsmount *, struct nfsreq *, kauth_cred_t, char **,
 	int *, char *, int *, NFSKERBKEY_T);
@@ -297,8 +305,4 @@ int netexport_check(const fsid_t *, stru
     kauth_cred_t *);
 void netexport_rdlock(void);
 void netexport_rdunlock(void);
-#ifdef COMPAT_30
-int nfs_update_exports_30(struct mount *, const char *,
-    struct mnt_export_args30 *, struct lwp *);
-#endif
 #endif /* _KERNEL */