diff options
author | phk <phk@FreeBSD.org> | 1997-10-12 20:26:33 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1997-10-12 20:26:33 +0000 |
commit | 36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5 (patch) | |
tree | e21c1d8330cbd5fba838afec549f8e4f0f66e451 /sys/kern | |
parent | 8ae70d2227594ff4a283453ca3cc3031eb78c14b (diff) | |
download | FreeBSD-src-36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5.zip FreeBSD-src-36e7a51ea1dedf0fc860ff3106aee1db1ab3b1f5.tar.gz |
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
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/inflate.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_descrip.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_exit.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_ktrace.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_lockf.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_malloc.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_proc.c | 7 | ||||
-rw-r--r-- | sys/kern/kern_prot.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_sysctl.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_clist.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_prf.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_prof.c | 4 | ||||
-rw-r--r-- | sys/kern/sys_generic.c | 7 | ||||
-rw-r--r-- | sys/kern/sysv_shm.c | 4 | ||||
-rw-r--r-- | sys/kern/tty.c | 4 | ||||
-rw-r--r-- | sys/kern/tty_snoop.c | 2 | ||||
-rw-r--r-- | sys/kern/tty_subr.c | 4 | ||||
-rw-r--r-- | sys/kern/uipc_mbuf.c | 3 | ||||
-rw-r--r-- | sys/kern/uipc_socket.c | 6 | ||||
-rw-r--r-- | sys/kern/uipc_syscalls.c | 4 | ||||
-rw-r--r-- | sys/kern/uipc_usrreq.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_aio.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_conf.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_export.c | 6 | ||||
-rw-r--r-- | sys/kern/vfs_extattr.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_init.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_mount.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_subr.c | 6 | ||||
-rw-r--r-- | sys/kern/vfs_syscalls.c | 4 |
30 files changed, 78 insertions, 55 deletions
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index 5c765e4..4558eb3 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -7,7 +7,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: inflate.c,v 1.9 1997/08/02 14:31:25 bde Exp $ + * $Id: inflate.c,v 1.10 1997/10/11 18:31:20 phk Exp $ * * */ @@ -19,7 +19,7 @@ #endif #include <sys/malloc.h> -MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees"); +static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees"); /* needed to make inflate() work */ #define uch u_char diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 442c17a..1275f0c 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.40 1997/09/14 02:52:13 peter Exp $ + * $Id: kern_descrip.c,v 1.41 1997/10/11 18:31:22 phk Exp $ */ #include <sys/param.h> @@ -66,7 +66,9 @@ #include <sys/devfsext.h> #endif /*DEVFS*/ -MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table"); +static MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table"); +static MALLOC_DEFINE(M_FILE, "file", "Open file structure"); + static d_open_t fdopen; #define NUMFDESC 64 diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 58a7d41..3d85909 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $Id: kern_exit.c,v 1.56 1997/09/21 22:00:10 gibbs Exp $ + * $Id: kern_exit.c,v 1.57 1997/10/11 18:31:22 phk Exp $ */ #include "opt_ktrace.h" @@ -44,11 +44,11 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> +#include <sys/malloc.h> #include <sys/proc.h> #include <sys/tty.h> #include <sys/wait.h> #include <sys/vnode.h> -#include <sys/malloc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> #include <sys/ptrace.h> @@ -70,7 +70,7 @@ #include <vm/pmap.h> #include <vm/vm_map.h> -MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); +static MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); static int wait1 __P((struct proc *, struct wait_args *, int [], int)); diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 3c52aed..94b650d2 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $Id: kern_ktrace.c,v 1.18 1997/03/23 03:36:19 bde Exp $ + * $Id: kern_ktrace.c,v 1.19 1997/10/11 18:31:22 phk Exp $ */ #include "opt_ktrace.h" @@ -47,7 +47,7 @@ #include <sys/malloc.h> #include <sys/syslog.h> -MALLOC_DEFINE(M_KTRACE, "KTRACE", "KTRACE"); +static MALLOC_DEFINE(M_KTRACE, "KTRACE", "KTRACE"); #ifdef KTRACE static struct ktr_header *ktrgetheader __P((int type)); diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index f8adbcc..a8f1a34 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94 - * $Id: kern_lockf.c,v 1.14 1997/04/01 10:30:06 bde Exp $ + * $Id: kern_lockf.c,v 1.15 1997/10/11 18:31:23 phk Exp $ */ #include <sys/param.h> @@ -65,7 +65,7 @@ static int lockf_debug = 0; SYSCTL_INT(_debug, OID_AUTO, lockf_debug, CTLFLAG_RW, &lockf_debug, 0, ""); #endif -MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures"); +static MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures"); #define NOLOCKF (struct lockf *)0 #define SELF 0x1 diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 3bb3f3e..df84db6 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.34 1997/10/11 10:49:43 phk Exp $ + * $Id: kern_malloc.c,v 1.35 1997/10/11 13:13:09 phk Exp $ */ #include <sys/param.h> @@ -54,6 +54,8 @@ static void kmeminit __P((void *)); static void malloc_init __P((struct malloc_type *)); SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL) +static MALLOC_DEFINE(M_FREE, "free", "should be on free list"); + struct malloc_type *kmemstatistics = M_FREE; static struct kmembuckets bucket[MINBUCKET + 16]; static struct kmemusage *kmemusage; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 1c79805..35e3046 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $Id: kern_proc.c,v 1.28 1997/08/02 14:31:33 bde Exp $ + * $Id: kern_proc.c,v 1.29 1997/10/11 18:31:23 phk Exp $ */ #include <sys/param.h> @@ -48,7 +48,10 @@ #include <vm/vm_map.h> #include <sys/user.h> -MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); +static MALLOC_DEFINE(M_PGRP, "pgrp", "process group header"); +MALLOC_DEFINE(M_SESSION, "session", "session header"); +MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); +MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures"); struct prochd qs[NQS]; /* as good a place as any... */ struct prochd rtqs[NQS]; /* Space for REALTIME queues too */ diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index 3db74aa..00978e2 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $Id: kern_prot.c,v 1.33 1997/08/02 14:31:34 bde Exp $ + * $Id: kern_prot.c,v 1.34 1997/08/19 06:00:27 peter Exp $ */ /* @@ -51,6 +51,8 @@ #include <sys/malloc.h> #include <sys/unistd.h> +static MALLOC_DEFINE(M_CRED, "cred", "credentials"); + #ifndef _SYS_SYSPROTO_H_ struct getpid_args { int dummy; diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 27e4e84..2b7bac3 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $Id: kern_sysctl.c,v 1.70 1997/04/09 15:23:09 bde Exp $ + * $Id: kern_sysctl.c,v 1.71 1997/10/11 18:31:24 phk Exp $ */ #include <sys/param.h> @@ -51,7 +51,7 @@ #include <vm/vm.h> #include <vm/vm_extern.h> -MALLOC_DEFINE(M_SYSCTL, "sysctl", "sysctl internal magic"); +static MALLOC_DEFINE(M_SYSCTL, "sysctl", "sysctl internal magic"); /* * Locking and stats diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c index d907b47..3a806b6 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subr.c,v 1.26 1997/03/05 16:45:01 bde Exp $ + * $Id: tty_subr.c,v 1.27 1997/03/24 11:24:37 bde Exp $ */ /* @@ -34,9 +34,9 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> +#include <sys/malloc.h> #include <sys/tty.h> #include <sys/clist.h> -#include <sys/malloc.h> static void clist_init __P((void *)); SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index a76cf7d..f166162 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,17 +36,17 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $Id: subr_prf.c,v 1.41 1997/02/22 09:39:17 peter Exp $ + * $Id: subr_prf.c,v 1.42 1997/09/02 20:05:51 bde Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/msgbuf.h> +#include <sys/malloc.h> #include <sys/proc.h> #include <sys/tty.h> #include <sys/tprintf.h> #include <sys/syslog.h> -#include <sys/malloc.h> #include <machine/cons.h> /* diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index 09e233d..9788da6 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_prof.c 8.3 (Berkeley) 9/23/93 - * $Id: subr_prof.c,v 1.20 1997/02/22 09:39:17 peter Exp $ + * $Id: subr_prof.c,v 1.21 1997/10/11 18:31:24 phk Exp $ */ #include <sys/param.h> @@ -48,7 +48,7 @@ #include <sys/malloc.h> #include <sys/gmon.h> -MALLOC_DEFINE(M_GPROF, "gprof", "kernel profiling buffer"); +static MALLOC_DEFINE(M_GPROF, "gprof", "kernel profiling buffer"); static void kmstartup __P((void *)); SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 709fe27..5b3a741 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $Id: sys_generic.c,v 1.29 1997/09/14 02:30:32 peter Exp $ + * $Id: sys_generic.c,v 1.30 1997/10/11 18:31:24 phk Exp $ */ #include "opt_ktrace.h" @@ -61,8 +61,9 @@ #include <sys/ktrace.h> #endif -MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer"); -MALLOC_DEFINE(M_SELECT, "select", "select() buffer"); +static MALLOC_DEFINE(M_IOCTLOPS, "ioctlops", "ioctl data buffer"); +static MALLOC_DEFINE(M_SELECT, "select", "select() buffer"); +MALLOC_DEFINE(M_IOV, "iov", "large iov's"); static int selscan __P((struct proc *, fd_mask **, fd_mask **, int, int *)); static int pollscan __P((struct proc *, struct pollfd *, int, int *)); diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 67251ea..a55d027 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $Id: sysv_shm.c,v 1.29 1997/08/02 14:31:39 bde Exp $ */ +/* $Id: sysv_shm.c,v 1.30 1997/10/11 18:31:25 phk Exp $ */ /* $NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $ */ /* @@ -65,7 +65,7 @@ struct shmget_args; extern int shmget __P((struct proc *p, struct shmget_args *uap, int *retval)); #endif -MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments"); +static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments"); static void shminit __P((void *)); SYSINIT(sysv_shm, SI_SUB_SYSV_SHM, SI_ORDER_FIRST, shminit, NULL) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 0be04a0..2bf7f20 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.95 1997/09/02 20:05:54 bde Exp $ + * $Id: tty.c,v 1.96 1997/09/14 02:40:44 peter Exp $ */ /*- @@ -98,6 +98,8 @@ #include <vm/pmap.h> #include <vm/vm_map.h> +MALLOC_DEFINE(M_TTYS, "ttys", "tty data structures"); + static int proc_compare __P((struct proc *p1, struct proc *p2)); static int ttnread __P((struct tty *tp)); static void ttyecho __P((int c, struct tty *tp)); diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index 42f23f3..98ac903 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -22,13 +22,13 @@ #include <sys/filio.h> #include <sys/ioctl_compat.h> /* Oooh..We need O/NTTYDISC */ #include <sys/proc.h> +#include <sys/malloc.h> #include <sys/tty.h> #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/poll.h> #include <sys/uio.h> #include <sys/kernel.h> -#include <sys/malloc.h> #ifdef DEVFS #include <sys/devfsext.h> #endif /*DEVFS*/ diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index d907b47..3a806b6 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: tty_subr.c,v 1.26 1997/03/05 16:45:01 bde Exp $ + * $Id: tty_subr.c,v 1.27 1997/03/24 11:24:37 bde Exp $ */ /* @@ -34,9 +34,9 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> +#include <sys/malloc.h> #include <sys/tty.h> #include <sys/clist.h> -#include <sys/malloc.h> static void clist_init __P((void *)); SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index a2551bf..484e208 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,13 +31,12 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.29 1997/02/24 20:30:55 wollman Exp $ + * $Id: uipc_mbuf.c,v 1.30 1997/08/02 14:31:41 bde Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> -#define MBTYPES #include <sys/mbuf.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 998e3f5..3aa73ed 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.31 1997/09/14 02:34:14 peter Exp $ + * $Id: uipc_socket.c,v 1.32 1997/10/04 18:21:15 phk Exp $ */ #include <sys/param.h> @@ -52,6 +52,10 @@ #include <machine/limits.h> +MALLOC_DEFINE(M_SOCKET, "socket", "socket structure"); +MALLOC_DEFINE(M_SONAME, "soname", "socket name"); +MALLOC_DEFINE(M_PCB, "pcb", "protocol control block"); + static int somaxconn = SOMAXCONN; SYSCTL_INT(_kern_ipc, KIPC_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, ""); diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 8b18787..ed42cce 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $Id: uipc_syscalls.c,v 1.29 1997/08/17 19:47:28 wollman Exp $ + * $Id: uipc_syscalls.c,v 1.30 1997/09/02 20:05:58 bde Exp $ */ #include "opt_ktrace.h" @@ -39,11 +39,11 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> +#include <sys/malloc.h> #include <sys/filedesc.h> #include <sys/proc.h> #include <sys/fcntl.h> #include <sys/file.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 1d86d15..bbf41bf 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.26 1997/09/02 20:05:59 bde Exp $ + * $Id: uipc_usrreq.c,v 1.27 1997/09/14 02:52:18 peter Exp $ */ #include <sys/param.h> @@ -53,6 +53,8 @@ #include <sys/un.h> #include <sys/vnode.h> +MALLOC_DEFINE(M_FILE, "file", "Open file structure"); + /* * Unix communications domain. * diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 8d5c3a3..1418878 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $Id: vfs_aio.c,v 1.6 1997/10/11 01:07:03 dyson Exp $ + * $Id: vfs_aio.c,v 1.7 1997/10/11 18:31:25 phk Exp $ */ /* @@ -54,7 +54,7 @@ #include <machine/cpu.h> -MALLOC_DEFINE(M_AIO, "AIO", "AIO structure(s)"); +static MALLOC_DEFINE(M_AIO, "AIO", "AIO structure(s)"); #define AIOCBLIST_CANCELLED 0x1 #define AIOCBLIST_RUNDOWN 0x4 diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index f7fb4f1..0630a45 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.128 1997/09/21 22:00:25 gibbs Exp $ + * $Id: vfs_bio.c,v 1.129 1997/10/11 18:31:26 phk Exp $ */ /* @@ -60,7 +60,7 @@ #include <miscfs/specfs/specdev.h> -MALLOC_DEFINE(M_BIOBUF, "BIO buffer", "BIO buffer"); +static MALLOC_DEFINE(M_BIOBUF, "BIO buffer", "BIO buffer"); static void vfs_update __P((void)); static struct proc *updateproc; diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 779a1c4..faa7363 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id$ + * $Id: vfs_conf.c,v 1.14 1997/02/22 09:39:32 peter Exp $ */ /* @@ -62,6 +62,8 @@ * GLOBALS */ +MALLOC_DEFINE(M_MOUNT, "mount", "vfs mount struct"); + /* * These define the root filesystem, device, and root filesystem type. */ diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 2969c8a..03c64d2 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.108 1997/10/11 07:34:27 phk Exp $ + * $Id: vfs_subr.c,v 1.109 1997/10/11 18:31:26 phk Exp $ */ /* @@ -49,11 +49,11 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> +#include <sys/malloc.h> #include <sys/mount.h> #include <sys/vnode.h> #include <sys/stat.h> #include <sys/buf.h> -#include <sys/malloc.h> #include <sys/poll.h> #include <sys/domain.h> #include <sys/dirent.h> @@ -68,7 +68,7 @@ #include <miscfs/specfs/specdev.h> -MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); #ifdef DDB extern void printlockedvnodes __P((void)); diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 0450d16..4a01b57 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.74 1997/09/27 13:39:06 kato Exp $ + * $Id: vfs_syscalls.c,v 1.75 1997/09/28 06:37:02 phk Exp $ */ /* @@ -60,9 +60,9 @@ #include <sys/stat.h> #include <sys/unistd.h> #include <sys/vnode.h> +#include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/malloc.h> #include <sys/dirent.h> #ifdef UNION diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 6bf5f6d..03bd9a6 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.27 1997/09/10 20:11:01 phk Exp $ + * $Id: vfs_init.c,v 1.28 1997/09/21 04:22:59 dyson Exp $ */ @@ -53,6 +53,8 @@ static void vfs_op_init __P((void)); static void vfsinit __P((void *)); SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vfsinit, NULL) +MALLOC_DEFINE(M_VNODE, "vnodes", "Dynamically allocated vnodes"); + /* * Sigh, such primitive tools are these... */ diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 779a1c4..faa7363 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94 - * $Id$ + * $Id: vfs_conf.c,v 1.14 1997/02/22 09:39:32 peter Exp $ */ /* @@ -62,6 +62,8 @@ * GLOBALS */ +MALLOC_DEFINE(M_MOUNT, "mount", "vfs mount struct"); + /* * These define the root filesystem, device, and root filesystem type. */ diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 2969c8a..03c64d2 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.108 1997/10/11 07:34:27 phk Exp $ + * $Id: vfs_subr.c,v 1.109 1997/10/11 18:31:26 phk Exp $ */ /* @@ -49,11 +49,11 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/proc.h> +#include <sys/malloc.h> #include <sys/mount.h> #include <sys/vnode.h> #include <sys/stat.h> #include <sys/buf.h> -#include <sys/malloc.h> #include <sys/poll.h> #include <sys/domain.h> #include <sys/dirent.h> @@ -68,7 +68,7 @@ #include <miscfs/specfs/specdev.h> -MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); #ifdef DDB extern void printlockedvnodes __P((void)); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 0450d16..4a01b57 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.74 1997/09/27 13:39:06 kato Exp $ + * $Id: vfs_syscalls.c,v 1.75 1997/09/28 06:37:02 phk Exp $ */ /* @@ -60,9 +60,9 @@ #include <sys/stat.h> #include <sys/unistd.h> #include <sys/vnode.h> +#include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/malloc.h> #include <sys/dirent.h> #ifdef UNION |