Last major round (Unless Bruce thinks of somthing :-) of malloc changes.

Distribute all but the most fundamental malloc types.  This time I also
remembered the trick to making things static:  Put "static" in front of
them.

A couple of finer points by:	bde

5 files changed, 31 insertions, 9 deletions

diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 8fa52f3..cd1db27 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.30 1997/08/16 19:15:54 wollman Exp $
+ * $Id: nfs.h,v 1.31 1997/09/10 19:52:24 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -300,6 +300,17 @@ struct nfsstats {
  */
 #ifdef KERNEL
 
+#ifdef MALLOC_DECLARE
+MALLOC_DECLARE(M_NFSREQ);
+MALLOC_DECLARE(M_NFSMNT);
+MALLOC_DECLARE(M_NFSDIROFF);
+MALLOC_DECLARE(M_NFSRVDESC);
+MALLOC_DECLARE(M_NFSUID);
+MALLOC_DECLARE(M_NQLEASE);
+MALLOC_DECLARE(M_NFSD);
+MALLOC_DECLARE(M_NFSBIGFH);
+#endif
+
 struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
 
 #define	NFSINT_SIGMASK	(sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index 6c6be6d..14eaedd 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.13 1997/08/02 14:33:07 bde Exp $
+ * $Id: nfs_srvcache.c,v 1.14 1997/08/16 19:15:58 wollman Exp $
  */
 
 #ifndef NFS_NOSERVER 
@@ -44,10 +44,10 @@
  *		pages 53-63. San Diego, February 1989.
  */
 #include <sys/param.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>	/* for dup_sockaddr */
 
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 82999f2..55ee3ed 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.27 1997/08/16 19:15:57 wollman Exp $
+ * $Id: nfs_socket.c,v 1.28 1997/09/02 01:19:37 bde Exp $
  */
 
 /*
@@ -44,9 +44,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/vnode.h>
 #include <sys/domain.h>
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 8e3955e..fcf1745 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.27 1997/08/16 19:16:00 wollman Exp $
+ * $Id: nfs_syscalls.c,v 1.28 1997/10/11 18:31:35 phk Exp $
  */
 
 #include <sys/param.h>
@@ -46,10 +46,10 @@
 #include <sys/filedesc.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
-#include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
@@ -75,7 +75,7 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
-MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure");
+static MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure");
 
 /* Global defs. */
 extern int (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd,
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 8fa52f3..cd1db27 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.30 1997/08/16 19:15:54 wollman Exp $
+ * $Id: nfs.h,v 1.31 1997/09/10 19:52:24 phk Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -300,6 +300,17 @@ struct nfsstats {
  */
 #ifdef KERNEL
 
+#ifdef MALLOC_DECLARE
+MALLOC_DECLARE(M_NFSREQ);
+MALLOC_DECLARE(M_NFSMNT);
+MALLOC_DECLARE(M_NFSDIROFF);
+MALLOC_DECLARE(M_NFSRVDESC);
+MALLOC_DECLARE(M_NFSUID);
+MALLOC_DECLARE(M_NQLEASE);
+MALLOC_DECLARE(M_NFSD);
+MALLOC_DECLARE(M_NFSBIGFH);
+#endif
+
 struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
 
 #define	NFSINT_SIGMASK	(sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \