d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Poul-Henning Kamp 1997-10-12 20:26:33 +00:00
parent 175dffc0f6
commit a1c995b626
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=30354
122 changed files with 469 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/amd64/amd64/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.267 1997/10/10 09:44:02 peter Exp $
* $Id: machdep.c,v 1.268 1997/10/10 12:42:52 peter Exp $
*/
#include "apm.h"
@ -134,6 +134,7 @@ extern void initializecpu(void);
static void cpu_startup __P((void *));
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
static MALLOC_DEFINE(M_MBUF, "mbuf", "mbuf");
#ifdef BOUNCE_BUFFERS
extern char *bouncememory;

2
sys/dev/rp/rp.c
View File

@ -37,11 +37,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <i386/isa/isa_device.h>

4
sys/dev/sio/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.182 1997/09/19 15:25:49 jmg Exp $
* $Id: sio.c,v 1.183 1997/09/21 21:41:40 gibbs Exp $
*/
#include "opt_comconsole.h"
@ -62,13 +62,13 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/reboot.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
#ifdef DEVFS

2
sys/dev/snp/snp.c
View File

@ -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*/

7
sys/fs/cd9660/cd9660_node.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.h 8.6 (Berkeley) 5/14/95
* $Id: cd9660_node.h,v 1.11 1997/04/14 18:15:45 phk Exp $
* $Id: cd9660_node.h,v 1.12 1997/08/26 07:32:31 phk Exp $
*/
/*
@ -92,6 +92,11 @@ struct iso_node {
#define VTOI(vp) ((struct iso_node *)(vp)->v_data)
#define ITOV(ip) ((ip)->i_vnode)
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_ISOFSMNT);
MALLOC_DECLARE(M_ISOFSNODE);
#endif
/*
* Prototypes for ISOFS vnode operations
*/

4
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
* $Id: cd9660_vfsops.c,v 1.28 1997/09/07 16:20:42 bde Exp $
* $Id: cd9660_vfsops.c,v 1.29 1997/09/27 13:38:48 kato Exp $
*/
#include <sys/param.h>
@ -59,6 +59,8 @@
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_mount.h>
MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure");
MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part");
static int cd9660_mount __P((struct mount *,
char *, caddr_t, struct nameidata *, struct proc *));

8
sys/fs/fdescfs/fdesc_vfsops.c
View File

@ -35,7 +35,7 @@
*
* @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94
*
* $Id: fdesc_vfsops.c,v 1.11 1997/08/02 14:31:59 bde Exp $
* $Id: fdesc_vfsops.c,v 1.12 1997/08/16 19:15:12 wollman Exp $
*/
/*
@ -53,6 +53,8 @@
#include <sys/malloc.h>
#include <miscfs/fdesc/fdesc.h>
static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure");
static int fdesc_fhtovp __P((struct mount *mp, struct fid *fhp,
struct mbuf *nam, struct vnode **vpp,
int *exflagsp, struct ucred **credanonp));
@ -98,7 +100,7 @@ fdesc_mount(mp, path, data, ndp, p)
return (error);
MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount),
M_UFSMNT, M_WAITOK); /* XXX */
M_FDESCMNT, M_WAITOK); /* XXX */
rvp->v_type = VDIR;
rvp->v_flag |= VROOT;
fmp->f_root = rvp;
@ -158,7 +160,7 @@ fdesc_unmount(mp, mntflags, p)
/*
* Finally, throw away the fdescmount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_FDESCMNT); /* XXX */
mp->mnt_data = 0;
return (0);

4
sys/fs/fifofs/fifo_vnops.c
View File

@ -31,20 +31,20 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
* $Id: fifo_vnops.c,v 1.26 1997/09/02 20:06:11 bde Exp $
* $Id: fifo_vnops.c,v 1.27 1997/09/14 02:57:53 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/unistd.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/filio.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/malloc.h>
#include <sys/poll.h>
#include <sys/un.h>
#include <miscfs/fifofs/fifo.h>

4
sys/fs/msdosfs/msdosfs_denode.c
View File

@ -1,4 +1,4 @@
/* $Id: msdosfs_denode.c,v 1.26 1997/09/02 20:06:15 bde Exp $ */
/* $Id: msdosfs_denode.c,v 1.27 1997/10/11 18:31:30 phk Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@ -66,7 +66,7 @@
#include <msdosfs/denode.h>
#include <msdosfs/fat.h>
MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part");
static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part");
struct denode **dehashtbl;
u_long dehash; /* size of hash table - 1 */

5
sys/fs/msdosfs/msdosfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $Id: msdosfs_vfsops.c,v 1.20 1997/08/16 19:15:24 wollman Exp $ */
/* $Id: msdosfs_vfsops.c,v 1.21 1997/10/11 18:31:30 phk Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */
/*-
@ -67,7 +67,8 @@
#include <msdosfs/msdosfsmount.h>
#include <msdosfs/fat.h>
MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table");
MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure");
static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table");
static int mountmsdosfs __P((struct vnode *devvp, struct mount *mp,
struct proc *p));

6
sys/fs/msdosfs/msdosfsmount.h
View File

@ -1,4 +1,4 @@
/* $Id: msdosfsmount.h,v 1.10 1997/02/22 09:40:49 peter Exp $ */
/* $Id: msdosfsmount.h,v 1.11 1997/03/03 17:36:11 bde Exp $ */
/* $NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $ */
/*-
@ -53,6 +53,10 @@
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_MSDOSFSMNT);
#endif
/*
* Layout of the mount control block for a msdos file system.
*/

12
sys/fs/nullfs/null_vfsops.c
View File

@ -36,7 +36,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
* $Id: null_vfsops.c,v 1.18 1997/08/02 14:32:05 bde Exp $
* $Id: null_vfsops.c,v 1.19 1997/08/16 19:15:16 wollman Exp $
*/
/*
@ -48,12 +48,14 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/nullfs/null.h>
static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure");
static int nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
struct sockaddr *nam, struct vnode **vpp,
int *exflagsp, struct ucred **credanonp));
@ -154,7 +156,7 @@ nullfs_mount(mp, path, data, ndp, p)
}
xmp = (struct null_mount *) malloc(sizeof(struct null_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_NULLFSMNT, M_WAITOK); /* XXX */
/*
* Save reference to underlying FS
@ -175,7 +177,7 @@ nullfs_mount(mp, path, data, ndp, p)
*/
if (error) {
vrele(lowerrootvp);
free(xmp, M_UFSMNT); /* XXX */
free(xmp, M_NULLFSMNT); /* XXX */
return (error);
}
@ -268,7 +270,7 @@ nullfs_unmount(mp, mntflags, p)
/*
* Finally, throw away the null_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_NULLFSMNT); /* XXX */
mp->mnt_data = 0;
return 0;
}

10
sys/fs/portalfs/portal_vfsops.c
View File

@ -35,7 +35,7 @@
*
* @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95
*
* $Id: portal_vfsops.c,v 1.16 1997/08/02 14:32:07 bde Exp $
* $Id: portal_vfsops.c,v 1.17 1997/08/16 19:15:17 wollman Exp $
*/
/*
@ -57,6 +57,8 @@
#include <sys/domain.h>
#include <miscfs/portal/portal.h>
static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure");
static int portal_init __P((struct vfsconf *));
static int portal_mount __P((struct mount *mp, char *path, caddr_t data,
struct nameidata *ndp, struct proc *p));
@ -116,11 +118,11 @@ portal_mount(mp, path, data, ndp, p)
M_TEMP, M_WAITOK);
MALLOC(fmp, struct portalmount *, sizeof(struct portalmount),
M_UFSMNT, M_WAITOK); /* XXX */
M_PORTALFSMNT, M_WAITOK); /* XXX */
error = getnewvnode(VT_PORTAL, mp, portal_vnodeop_p, &rvp); /* XXX */
if (error) {
FREE(fmp, M_UFSMNT);
FREE(fmp, M_PORTALFSMNT);
FREE(pn, M_TEMP);
return (error);
}
@ -213,7 +215,7 @@ portal_unmount(mp, mntflags, p)
/*
* Finally, throw away the portalmount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_PORTALFSMNT); /* XXX */
mp->mnt_data = 0;
return (0);
}

10
sys/fs/umapfs/umap_vfsops.c
View File

@ -35,7 +35,7 @@
*
* @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95
*
* $Id: umap_vfsops.c,v 1.15 1997/08/02 14:32:25 bde Exp $
* $Id: umap_vfsops.c,v 1.16 1997/08/16 19:15:21 wollman Exp $
*/
/*
@ -53,6 +53,8 @@
#include <sys/malloc.h>
#include <miscfs/umapfs/umap.h>
static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure");
static int umapfs_fhtovp __P((struct mount *mp, struct fid *fidp,
struct sockaddr *nam, struct vnode **vpp,
int *exflagsp, struct ucred **credanonp));
@ -138,7 +140,7 @@ umapfs_mount(mp, path, data, ndp, p)
#endif
amp = (struct umap_mount *) malloc(sizeof(struct umap_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_UMAPFSMNT, M_WAITOK); /* XXX */
/*
* Save reference to underlying FS
@ -190,7 +192,7 @@ umapfs_mount(mp, path, data, ndp, p)
*/
if (error) {
vrele(lowerrootvp);
free(amp, M_UFSMNT); /* XXX */
free(amp, M_UMAPFSMNT); /* XXX */
return (error);
}
@ -283,7 +285,7 @@ umapfs_unmount(mp, mntflags, p)
/*
* Finally, throw away the umap_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_UMAPFSMNT); /* XXX */
mp->mnt_data = 0;
return (0);
}

10
sys/fs/unionfs/union_vfsops.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95
* $Id: union_vfsops.c,v 1.19 1997/08/16 19:15:22 wollman Exp $
* $Id: union_vfsops.c,v 1.20 1997/09/27 13:39:29 kato Exp $
*/
/*
@ -53,6 +53,8 @@
#include <sys/filedesc.h>
#include <miscfs/union/union.h>
static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure");
extern int union_init __P((struct vfsconf *));
extern int union_fhtovp __P((struct mount *mp, struct fid *fidp,
@ -176,7 +178,7 @@ union_mount(mp, path, data, ndp, p)
}
um = (struct union_mount *) malloc(sizeof(struct union_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_UNIONFSMNT, M_WAITOK); /* XXX */
/*
* Keep a held reference to the target vnodes.
@ -286,7 +288,7 @@ union_mount(mp, path, data, ndp, p)
bad:
if (um)
free(um, M_UFSMNT);
free(um, M_UNIONFSMNT);
if (cred)
crfree(cred);
if (upperrootvp)
@ -390,7 +392,7 @@ union_unmount(mp, mntflags, p)
/*
* Finally, throw away the union_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_UNIONFSMNT); /* XXX */
mp->mnt_data = 0;
return (0);
}

5
sys/gnu/ext2fs/ext2_ihash.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95
* $Id$
* $Id: ufs_ihash.c,v 1.8 1997/02/22 09:47:47 peter Exp $
*/
#include <sys/param.h>
@ -44,6 +44,7 @@
#include <ufs/ufs/inode.h>
#include <ufs/ufs/ufs_extern.h>
static MALLOC_DEFINE(M_UFSIHASH, "UFS ihash", "UFS Inode hash tables");
/*
* Structures associated with inode cacheing.
*/
@ -59,7 +60,7 @@ void
ufs_ihashinit()
{
ihashtbl = hashinit(desiredvnodes, M_UFSMNT, &ihash);
ihashtbl = hashinit(desiredvnodes, M_UFSIHASH, &ihash);
simple_lock_init(&ufs_ihash_slock);
}

7
sys/gnu/ext2fs/ext2_mount.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ufsmount.h 8.6 (Berkeley) 3/30/95
* $Id: ufsmount.h,v 1.8 1997/09/22 21:24:03 joerg Exp $
* $Id: ufsmount.h,v 1.9 1997/10/10 18:18:13 phk Exp $
*/
#ifndef _UFS_UFS_UFSMOUNT_H_
@ -56,6 +56,11 @@ struct mfs_args {
};
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_UFSMNT);
#endif
struct buf;
struct inode;
struct nameidata;

2
sys/gnu/ext2fs/ext2_vfsops.c
View File

@ -86,7 +86,7 @@ static int ext2_unmount __P((struct mount *, int, struct proc *));
static int ext2_vget __P((struct mount *, ino_t, struct vnode **));
static int ext2_vptofh __P((struct vnode *, struct fid *));
MALLOC_DEFINE(M_EXT2NODE, "EXT2 nodes", "EXT2 Filsystem inodes");
static MALLOC_DEFINE(M_EXT2NODE, "EXT2 nodes", "EXT2 Filsystem inodes");
static struct vfsops ext2fs_vfsops = {
ext2_mount,

7
sys/gnu/fs/ext2fs/ext2_mount.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ufsmount.h 8.6 (Berkeley) 3/30/95
* $Id: ufsmount.h,v 1.8 1997/09/22 21:24:03 joerg Exp $
* $Id: ufsmount.h,v 1.9 1997/10/10 18:18:13 phk Exp $
*/
#ifndef _UFS_UFS_UFSMOUNT_H_
@ -56,6 +56,11 @@ struct mfs_args {
};
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_UFSMNT);
#endif
struct buf;
struct inode;
struct nameidata;

2
sys/gnu/fs/ext2fs/ext2_vfsops.c
View File

@ -86,7 +86,7 @@ static int ext2_unmount __P((struct mount *, int, struct proc *));
static int ext2_vget __P((struct mount *, ino_t, struct vnode **));
static int ext2_vptofh __P((struct vnode *, struct fid *));
MALLOC_DEFINE(M_EXT2NODE, "EXT2 nodes", "EXT2 Filsystem inodes");
static MALLOC_DEFINE(M_EXT2NODE, "EXT2 nodes", "EXT2 Filsystem inodes");
static struct vfsops ext2fs_vfsops = {
ext2_mount,

3
sys/i386/i386/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.267 1997/10/10 09:44:02 peter Exp $
* $Id: machdep.c,v 1.268 1997/10/10 12:42:52 peter Exp $
*/
#include "apm.h"
@ -134,6 +134,7 @@ extern void initializecpu(void);
static void cpu_startup __P((void *));
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
static MALLOC_DEFINE(M_MBUF, "mbuf", "mbuf");
#ifdef BOUNCE_BUFFERS
extern char *bouncememory;

6
sys/i386/i386/userconfig.c
View File

@ -46,7 +46,7 @@
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
**
** $Id: userconfig.c,v 1.93 1997/09/18 08:00:48 jmg Exp $
** $Id: userconfig.c,v 1.94 1997/10/11 18:31:19 phk Exp $
**/
/**
@ -126,7 +126,7 @@
#include <pci/pcivar.h>
MALLOC_DEFINE(M_DEVL, "isa_devlist", "isa_device lists in userconfig()");
static MALLOC_DEFINE(M_DEVL, "isa_devlist", "isa_device lists in userconfig()");
static struct isa_device *isa_devlist; /* list read by dset to extract changes */
@ -2367,7 +2367,7 @@ visuserconfig(void)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.93 1997/09/18 08:00:48 jmg Exp $
* $Id: userconfig.c,v 1.94 1997/10/11 18:31:19 phk Exp $
*/
#include "scbus.h"

2
sys/i386/isa/rp.c
View File

@ -37,11 +37,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <i386/isa/isa_device.h>

4
sys/i386/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.182 1997/09/19 15:25:49 jmg Exp $
* $Id: sio.c,v 1.183 1997/09/21 21:41:40 gibbs Exp $
*/
#include "opt_comconsole.h"
@ -62,13 +62,13 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/reboot.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
#ifdef DEVFS

4
sys/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.182 1997/09/19 15:25:49 jmg Exp $
* $Id: sio.c,v 1.183 1997/09/21 21:41:40 gibbs Exp $
*/
#include "opt_comconsole.h"
@ -62,13 +62,13 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/reboot.h>
#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/dkstat.h>
#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
#ifdef DEVFS

7
sys/isofs/cd9660/cd9660_node.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_node.h 8.6 (Berkeley) 5/14/95
* $Id: cd9660_node.h,v 1.11 1997/04/14 18:15:45 phk Exp $
* $Id: cd9660_node.h,v 1.12 1997/08/26 07:32:31 phk Exp $
*/
/*
@ -92,6 +92,11 @@ struct iso_node {
#define VTOI(vp) ((struct iso_node *)(vp)->v_data)
#define ITOV(ip) ((ip)->i_vnode)
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_ISOFSMNT);
MALLOC_DECLARE(M_ISOFSNODE);
#endif
/*
* Prototypes for ISOFS vnode operations
*/

4
sys/isofs/cd9660/cd9660_vfsops.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
* $Id: cd9660_vfsops.c,v 1.28 1997/09/07 16:20:42 bde Exp $
* $Id: cd9660_vfsops.c,v 1.29 1997/09/27 13:38:48 kato Exp $
*/
#include <sys/param.h>
@ -59,6 +59,8 @@
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_mount.h>
MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure");
MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part");
static int cd9660_mount __P((struct mount *,
char *, caddr_t, struct nameidata *, struct proc *));

4
sys/kern/inflate.c
View File

@ -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

6
sys/kern/kern_descrip.c
View File

@ -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

6
sys/kern/kern_exit.c
View File

@ -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));

4
sys/kern/kern_ktrace.c
View File

@ -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));

4
sys/kern/kern_lockf.c
View File

@ -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

4
sys/kern/kern_malloc.c
View File

@ -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;

7
sys/kern/kern_proc.c
View File

@ -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 */

4
sys/kern/kern_prot.c
View File

@ -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;

4
sys/kern/kern_sysctl.c
View File

@ -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

4
sys/kern/subr_clist.c
View File

@ -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)

4
sys/kern/subr_prf.c
View File

@ -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>
/*

4
sys/kern/subr_prof.c
View File

@ -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)

7
sys/kern/sys_generic.c
View File

@ -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 *));

4
sys/kern/sysv_shm.c
View File

@ -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)

4
sys/kern/tty.c
View File

@ -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));

2
sys/kern/tty_snoop.c
View File

@ -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*/

4
sys/kern/tty_subr.c
View File

@ -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)

3
sys/kern/uipc_mbuf.c
View File

@ -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>

6
sys/kern/uipc_socket.c
View File

@ -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, "");

4
sys/kern/uipc_syscalls.c
View File

@ -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>

4
sys/kern/uipc_usrreq.c
View File

@ -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.
*

4
sys/kern/vfs_aio.c
View File

@ -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

4
sys/kern/vfs_bio.c
View File

@ -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;

4
sys/kern/vfs_conf.c
View File

@ -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.
*/

6
sys/kern/vfs_export.c
View File

@ -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));

4
sys/kern/vfs_extattr.c
View File

@ -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

4
sys/kern/vfs_init.c
View File

@ -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...
*/

4
sys/kern/vfs_mount.c
View File

@ -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.
*/

6
sys/kern/vfs_subr.c
View File

@ -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));

4
sys/kern/vfs_syscalls.c
View File

@ -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

8
sys/miscfs/devfs/devfs_tree.c
View File

@ -2,7 +2,7 @@
/*
* Written by Julian Elischer (julian@DIALix.oz.au)
*
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.42 1997/10/10 07:54:05 julian Exp $
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_tree.c,v 1.43 1997/10/11 18:31:28 phk Exp $
*/
#include "opt_devfs.h"
@ -11,11 +11,11 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/time.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
#include <sys/devfsext.h>
#include <machine/stdarg.h>
@ -23,8 +23,8 @@
#include <miscfs/devfs/devfsdefs.h>
MALLOC_DEFINE(M_DEVFSNODE, "DEVFS node", "DEVFS node");
MALLOC_DEFINE(M_DEVFSNAME, "DEVFS name", "DEVFS name");
static MALLOC_DEFINE(M_DEVFSNODE, "DEVFS node", "DEVFS node");
static MALLOC_DEFINE(M_DEVFSNAME, "DEVFS name", "DEVFS name");
devnm_p dev_root; /* root of the backing tree */
struct mount *devfs_hidden_mount;

4
sys/miscfs/devfs/devfs_vfsops.c
View File

@ -1,7 +1,7 @@
/*
* Written by Julian Elischer (julian@DIALix.oz.au)
*
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.20 1997/08/16 19:15:10 wollman Exp $
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.21 1997/10/11 18:31:28 phk Exp $
*
*
*/
@ -15,7 +15,7 @@
#include <miscfs/devfs/devfsdefs.h>
MALLOC_DEFINE(M_DEVFSMNT, "DEVFS mount", "DEVFS mount structure");
static MALLOC_DEFINE(M_DEVFSMNT, "DEVFS mount", "DEVFS mount structure");
static int devfs_statfs( struct mount *mp, struct statfs *sbp, struct proc *p);
static int mountdevfs( struct mount *mp, struct proc *p);

8
sys/miscfs/fdesc/fdesc_vfsops.c
View File

@ -35,7 +35,7 @@
*
* @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94
*
* $Id: fdesc_vfsops.c,v 1.11 1997/08/02 14:31:59 bde Exp $
* $Id: fdesc_vfsops.c,v 1.12 1997/08/16 19:15:12 wollman Exp $
*/
/*
@ -53,6 +53,8 @@
#include <sys/malloc.h>
#include <miscfs/fdesc/fdesc.h>
static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure");
static int fdesc_fhtovp __P((struct mount *mp, struct fid *fhp,
struct mbuf *nam, struct vnode **vpp,
int *exflagsp, struct ucred **credanonp));
@ -98,7 +100,7 @@ fdesc_mount(mp, path, data, ndp, p)
return (error);
MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount),
M_UFSMNT, M_WAITOK); /* XXX */
M_FDESCMNT, M_WAITOK); /* XXX */
rvp->v_type = VDIR;
rvp->v_flag |= VROOT;
fmp->f_root = rvp;
@ -158,7 +160,7 @@ fdesc_unmount(mp, mntflags, p)
/*
* Finally, throw away the fdescmount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_FDESCMNT); /* XXX */
mp->mnt_data = 0;
return (0);

4
sys/miscfs/fifofs/fifo_vnops.c
View File

@ -31,20 +31,20 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
* $Id: fifo_vnops.c,v 1.26 1997/09/02 20:06:11 bde Exp $
* $Id: fifo_vnops.c,v 1.27 1997/09/14 02:57:53 peter Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/unistd.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/filio.h>
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/malloc.h>
#include <sys/poll.h>
#include <sys/un.h>
#include <miscfs/fifofs/fifo.h>

10
sys/miscfs/kernfs/kernfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95
* $Id: kernfs_vfsops.c,v 1.18 1997/02/22 09:40:19 peter Exp $
* $Id: kernfs_vfsops.c,v 1.19 1997/08/02 14:32:02 bde Exp $
*/
/*
@ -52,6 +52,8 @@
#include <miscfs/kernfs/kernfs.h>
static MALLOC_DEFINE(M_KERNFSMNT, "KERNFS mount", "KERNFS mount structure");
dev_t rrootdev = NODEV;
static int cdevvp __P((dev_t dev, struct vnode **vpp));
@ -128,11 +130,11 @@ kernfs_mount(mp, path, data, ndp, p)
return (EOPNOTSUPP);
MALLOC(fmp, struct kernfs_mount *, sizeof(struct kernfs_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_KERNFSMNT, M_WAITOK); /* XXX */
error = getnewvnode(VT_KERNFS, mp, kernfs_vnodeop_p, &rvp); /* XXX */
if (error) {
FREE(fmp, M_UFSMNT);
FREE(fmp, M_KERNFSMNT);
return (error);
}
@ -213,7 +215,7 @@ kernfs_unmount(mp, mntflags, p)
/*
* Finally, throw away the kernfs_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_KERNFSMNT); /* XXX */
mp->mnt_data = 0;
return 0;
}

12
sys/miscfs/nullfs/null_vfsops.c
View File

@ -36,7 +36,7 @@
* @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
*
* @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
* $Id: null_vfsops.c,v 1.18 1997/08/02 14:32:05 bde Exp $
* $Id: null_vfsops.c,v 1.19 1997/08/16 19:15:16 wollman Exp $
*/
/*
@ -48,12 +48,14 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/malloc.h>
#include <miscfs/nullfs/null.h>
static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure");
static int nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
struct sockaddr *nam, struct vnode **vpp,
int *exflagsp, struct ucred **credanonp));
@ -154,7 +156,7 @@ nullfs_mount(mp, path, data, ndp, p)
}
xmp = (struct null_mount *) malloc(sizeof(struct null_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_NULLFSMNT, M_WAITOK); /* XXX */
/*
* Save reference to underlying FS
@ -175,7 +177,7 @@ nullfs_mount(mp, path, data, ndp, p)
*/
if (error) {
vrele(lowerrootvp);
free(xmp, M_UFSMNT); /* XXX */
free(xmp, M_NULLFSMNT); /* XXX */
return (error);
}
@ -268,7 +270,7 @@ nullfs_unmount(mp, mntflags, p)
/*
* Finally, throw away the null_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_NULLFSMNT); /* XXX */
mp->mnt_data = 0;
return 0;
}

10
sys/miscfs/portal/portal_vfsops.c
View File

@ -35,7 +35,7 @@
*
* @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95
*
* $Id: portal_vfsops.c,v 1.16 1997/08/02 14:32:07 bde Exp $
* $Id: portal_vfsops.c,v 1.17 1997/08/16 19:15:17 wollman Exp $
*/
/*
@ -57,6 +57,8 @@
#include <sys/domain.h>
#include <miscfs/portal/portal.h>
static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure");
static int portal_init __P((struct vfsconf *));
static int portal_mount __P((struct mount *mp, char *path, caddr_t data,
struct nameidata *ndp, struct proc *p));
@ -116,11 +118,11 @@ portal_mount(mp, path, data, ndp, p)
M_TEMP, M_WAITOK);
MALLOC(fmp, struct portalmount *, sizeof(struct portalmount),
M_UFSMNT, M_WAITOK); /* XXX */
M_PORTALFSMNT, M_WAITOK); /* XXX */
error = getnewvnode(VT_PORTAL, mp, portal_vnodeop_p, &rvp); /* XXX */
if (error) {
FREE(fmp, M_UFSMNT);
FREE(fmp, M_PORTALFSMNT);
FREE(pn, M_TEMP);
return (error);
}
@ -213,7 +215,7 @@ portal_unmount(mp, mntflags, p)
/*
* Finally, throw away the portalmount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_PORTALFSMNT); /* XXX */
mp->mnt_data = 0;
return (0);
}

10
sys/miscfs/umapfs/umap_vfsops.c
View File

@ -35,7 +35,7 @@
*
* @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95
*
* $Id: umap_vfsops.c,v 1.15 1997/08/02 14:32:25 bde Exp $
* $Id: umap_vfsops.c,v 1.16 1997/08/16 19:15:21 wollman Exp $
*/
/*
@ -53,6 +53,8 @@
#include <sys/malloc.h>
#include <miscfs/umapfs/umap.h>
static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure");
static int umapfs_fhtovp __P((struct mount *mp, struct fid *fidp,
struct sockaddr *nam, struct vnode **vpp,
int *exflagsp, struct ucred **credanonp));
@ -138,7 +140,7 @@ umapfs_mount(mp, path, data, ndp, p)
#endif
amp = (struct umap_mount *) malloc(sizeof(struct umap_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_UMAPFSMNT, M_WAITOK); /* XXX */
/*
* Save reference to underlying FS
@ -190,7 +192,7 @@ umapfs_mount(mp, path, data, ndp, p)
*/
if (error) {
vrele(lowerrootvp);
free(amp, M_UFSMNT); /* XXX */
free(amp, M_UMAPFSMNT); /* XXX */
return (error);
}
@ -283,7 +285,7 @@ umapfs_unmount(mp, mntflags, p)
/*
* Finally, throw away the umap_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_UMAPFSMNT); /* XXX */
mp->mnt_data = 0;
return (0);
}

10
sys/miscfs/union/union_vfsops.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95
* $Id: union_vfsops.c,v 1.19 1997/08/16 19:15:22 wollman Exp $
* $Id: union_vfsops.c,v 1.20 1997/09/27 13:39:29 kato Exp $
*/
/*
@ -53,6 +53,8 @@
#include <sys/filedesc.h>
#include <miscfs/union/union.h>
static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure");
extern int union_init __P((struct vfsconf *));
extern int union_fhtovp __P((struct mount *mp, struct fid *fidp,
@ -176,7 +178,7 @@ union_mount(mp, path, data, ndp, p)
}
um = (struct union_mount *) malloc(sizeof(struct union_mount),
M_UFSMNT, M_WAITOK); /* XXX */
M_UNIONFSMNT, M_WAITOK); /* XXX */
/*
* Keep a held reference to the target vnodes.
@ -286,7 +288,7 @@ union_mount(mp, path, data, ndp, p)
bad:
if (um)
free(um, M_UFSMNT);
free(um, M_UNIONFSMNT);
if (cred)
crfree(cred);
if (upperrootvp)
@ -390,7 +392,7 @@ union_unmount(mp, mntflags, p)
/*
* Finally, throw away the union_mount structure
*/
free(mp->mnt_data, M_UFSMNT); /* XXX */
free(mp->mnt_data, M_UNIONFSMNT); /* XXX */
mp->mnt_data = 0;
return (0);
}

4
sys/msdosfs/msdosfs_denode.c
View File

@ -1,4 +1,4 @@
/* $Id: msdosfs_denode.c,v 1.26 1997/09/02 20:06:15 bde Exp $ */
/* $Id: msdosfs_denode.c,v 1.27 1997/10/11 18:31:30 phk Exp $ */
/* $NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $ */
/*-
@ -66,7 +66,7 @@
#include <msdosfs/denode.h>
#include <msdosfs/fat.h>
MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part");
static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part");
struct denode **dehashtbl;
u_long dehash; /* size of hash table - 1 */

5
sys/msdosfs/msdosfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $Id: msdosfs_vfsops.c,v 1.20 1997/08/16 19:15:24 wollman Exp $ */
/* $Id: msdosfs_vfsops.c,v 1.21 1997/10/11 18:31:30 phk Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */
/*-
@ -67,7 +67,8 @@
#include <msdosfs/msdosfsmount.h>
#include <msdosfs/fat.h>
MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table");
MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure");
static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table");
static int mountmsdosfs __P((struct vnode *devvp, struct mount *mp,
struct proc *p));

6
sys/msdosfs/msdosfsmount.h
View File

@ -1,4 +1,4 @@
/* $Id: msdosfsmount.h,v 1.10 1997/02/22 09:40:49 peter Exp $ */
/* $Id: msdosfsmount.h,v 1.11 1997/03/03 17:36:11 bde Exp $ */
/* $NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $ */
/*-
@ -53,6 +53,10 @@
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_MSDOSFSMNT);
#endif
/*
* Layout of the mount control block for a msdos file system.
*/

4
sys/net/hostcache.c
View File

@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: hostcache.c,v 1.1 1997/06/18 01:24:21 wollman Exp $
*/
#include <sys/param.h>
@ -38,6 +38,8 @@
#include <net/hostcache.h>
#include <net/route.h>
MALLOC_DEFINE(M_HOSTCACHE, "hostcache", "per-host cache structure");
static struct hctable hctable[AF_MAX];
static int hc_timeout_interval = 120;
static int hc_maxidle = 1800;

6
sys/net/hostcache.h
View File

@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: hostcache.h,v 1.1 1997/06/18 01:24:22 wollman Exp $
*/
#ifndef _NET_HOSTCACHE_H
@ -76,6 +76,10 @@ struct hctable {
};
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_HOSTCACHE);
#endif
/*
* The table-modification functions must be called from user mode, as
* they may block waiting for memory and/or locks.

4
sys/net/if.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if.c 8.3 (Berkeley) 1/4/94
* $Id: if.c,v 1.53 1997/09/07 11:09:22 joerg Exp $
* $Id: if.c,v 1.54 1997/10/07 07:40:35 joerg Exp $
*/
#include <sys/param.h>
@ -66,6 +66,8 @@ static void link_rtrequest __P((int, struct rtentry *, struct sockaddr *));
SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL)
MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address");
MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address");
int ifqmaxlen = IFQ_MAXLEN;
struct ifnethead ifnet; /* depend on static init XXX */

9
sys/net/if.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if.h 8.1 (Berkeley) 6/10/93
* $Id: if.h,v 1.45 1997/02/22 09:40:58 peter Exp $
* $Id: if.h,v 1.46 1997/05/03 21:07:12 peter Exp $
*/
#ifndef _NET_IF_H_
@ -199,6 +199,13 @@ struct ifconf {
#define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */
};
#ifdef KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_IFADDR);
MALLOC_DECLARE(M_IFMADDR);
#endif
#endif
/* XXX - this should go away soon */
#ifdef KERNEL
#include <net/if_var.h>

6
sys/net/radix.h
View File

@ -31,12 +31,16 @@
* SUCH DAMAGE.
*
* @(#)radix.h 8.2 (Berkeley) 10/31/94
* $Id: radix.h,v 1.11 1997/02/22 09:41:12 peter Exp $
* $Id: radix.h,v 1.12 1997/09/07 08:49:04 bde Exp $
*/
#ifndef _RADIX_H_
#define _RADIX_H_
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_RTABLE);
#endif
/*
* Radix search tree node layout.
*/

4
sys/net/rtsock.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)rtsock.c 8.5 (Berkeley) 11/2/94
* $Id: rtsock.c,v 1.33 1997/09/02 01:18:49 bde Exp $
* $Id: rtsock.c,v 1.34 1997/09/14 03:10:38 peter Exp $
*/
@ -52,6 +52,8 @@
#include <net/route.h>
#include <net/raw_cb.h>
MALLOC_DEFINE(M_RTABLE, "routetbl", "routing tables");
static struct sockaddr route_dst = { 2, PF_ROUTE, };
static struct sockaddr route_src = { 2, PF_ROUTE, };
static struct sockaddr sa_zero = { sizeof(sa_zero), AF_INET, };

4
sys/netinet/igmp.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* @(#)igmp.c 8.1 (Berkeley) 7/19/93
* $Id: igmp.c,v 1.23 1997/09/16 11:43:50 bde Exp $
* $Id: igmp.c,v 1.24 1997/10/11 18:31:31 phk Exp $
*/
/*
@ -69,7 +69,7 @@
#include <netinet/igmp.h>
#include <netinet/igmp_var.h>
MALLOC_DEFINE(M_MRTABLE, "mrt", "multicast routing tables");
static MALLOC_DEFINE(M_MRTABLE, "mrt", "multicast routing tables");
static struct router_info *
find_rti __P((struct ifnet *ifp));

4
sys/netinet/in.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)in.c 8.4 (Berkeley) 1/9/95
* $Id: in.c,v 1.35 1997/08/02 14:32:49 bde Exp $
* $Id: in.c,v 1.36 1997/10/11 18:31:31 phk Exp $
*/
#include <sys/param.h>
@ -51,7 +51,7 @@
#include <netinet/igmp_var.h>
MALLOC_DEFINE(M_IPMADDR, "in_multi", "internet multicast address");
static MALLOC_DEFINE(M_IPMADDR, "in_multi", "internet multicast address");
static void in_socktrim __P((struct sockaddr_in *));
static int in_ifinit __P((struct ifnet *,

4
sys/netinet/ip_fw.c
View File

@ -12,7 +12,7 @@
*
* This software is provided ``AS IS'' without any warranties of any kind.
*
* $Id: ip_fw.c,v 1.62 1997/08/23 14:28:22 alex Exp $
* $Id: ip_fw.c,v 1.63 1997/09/10 03:07:14 peter Exp $
*/
/*
@ -57,6 +57,8 @@ static int fw_verbose_limit = 0;
LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain;
static MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's");
#ifdef SYSCTL_NODE
SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall");
SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug, CTLFLAG_RW, &fw_debug, 0, "");

4
sys/netinet/ip_output.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
* $Id: ip_output.c,v 1.58 1997/08/02 14:32:53 bde Exp $
* $Id: ip_output.c,v 1.59 1997/10/11 18:31:32 phk Exp $
*/
#define _IP_VHL
@ -59,7 +59,7 @@
#endif
#include <machine/in_cksum.h>
MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options");
static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options");
#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1
#undef COMPAT_IPFW

2
sys/netkey/key.c
View File

@ -101,7 +101,7 @@ Research Laboratory (NRL).
#include <netkey/key.h>
#include <netkey/key_debug.h>
MALLOC_DEFINE(M_SECA, "key mgmt", "security associations, key management");
static MALLOC_DEFINE(M_SECA, "key mgmt", "security associations, key management");
#define SOCKADDR struct sockaddr

2
sys/netnatm/natm_pcb.c
View File

@ -39,8 +39,8 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/socket.h>
#include <sys/malloc.h>
#include <sys/socket.h>
#include <net/if.h>

4
sys/nfs/krpc_subr.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */
/* $Id: krpc_subr.c,v 1.4 1997/08/16 19:15:53 wollman Exp $ */
/* $Id: krpc_subr.c,v 1.5 1997/09/02 01:19:26 bde Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@ -48,8 +48,8 @@
#include <sys/conf.h>
#include <sys/sockio.h>
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/mbuf.h>
#include <sys/reboot.h>
#include <sys/socket.h>

13
sys/nfs/nfs.h
View File

@ -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)| \

4
sys/nfs/nfs_node.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
* $Id: nfs_node.c,v 1.19 1997/09/21 04:23:45 dyson Exp $
* $Id: nfs_node.c,v 1.20 1997/10/11 18:31:34 phk Exp $
*/
@ -51,7 +51,7 @@
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
MALLOC_DEFINE(M_NFSNODE, "NFS node", "NFS vnode private part");
static MALLOC_DEFINE(M_NFSNODE, "NFS node", "NFS vnode private part");
LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
u_long nfsnodehash;

6
sys/nfs/nfs_nqlease.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95
* $Id: nfs_nqlease.c,v 1.28 1997/09/02 01:19:30 bde Exp $
* $Id: nfs_nqlease.c,v 1.29 1997/10/11 18:31:34 phk Exp $
*/
@ -53,11 +53,11 @@
*/
#include <sys/param.h>
#include <sys/vnode.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
@ -76,7 +76,7 @@
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
MALLOC_DEFINE(M_NQMHOST, "NQNFS Host", "Nqnfs host address table");
static MALLOC_DEFINE(M_NQMHOST, "NQNFS Host", "Nqnfs host address table");
time_t nqnfsstarttime = (time_t)0;
int nqsrv_clockskew = NQ_CLOCKSKEW;

4
sys/nfs/nfs_socket.c
View File

@ -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>

4
sys/nfs/nfs_srvcache.c
View File

@ -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 */

6
sys/nfs/nfs_syscalls.c
View File

@ -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,

13
sys/nfs/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
* $Id: nfs_vfsops.c,v 1.47 1997/09/07 12:56:44 bde Exp $
* $Id: nfs_vfsops.c,v 1.48 1997/09/10 19:52:26 phk Exp $
*/
#include <sys/param.h>
@ -46,9 +46,9 @@
#include <sys/vnode.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
@ -76,6 +76,15 @@ extern int nfs_mountroot __P((struct mount *mp));
extern int nfs_ticks;
MALLOC_DEFINE(M_NFSREQ, "NFS req", "NFS request header");
MALLOC_DEFINE(M_NFSMNT, "NFS mount", "NFS mount structure");
MALLOC_DEFINE(M_NFSBIGFH, "NFSV3 bigfh", "NFS version 3 file handle");
MALLOC_DEFINE(M_NFSD, "NFS daemon", "Nfs server daemon structure");
MALLOC_DEFINE(M_NFSDIROFF, "NFSV3 diroff", "NFS directory offset data");
MALLOC_DEFINE(M_NFSRVDESC, "NFSV3 srvdesc", "NFS server socket descriptor");
MALLOC_DEFINE(M_NFSUID, "NFS uid", "Nfs uid mapping structure");
MALLOC_DEFINE(M_NQLEASE, "NQNFS Lease", "Nqnfs lease");
struct nfsstats nfsstats;
SYSCTL_NODE(_vfs, MOUNT_NFS, nfs, CTLFLAG_RW, 0, "NFS filesystem");
SYSCTL_STRUCT(_vfs_nfs, NFS_NFSSTATS, nfsstats, CTLFLAG_RD,

4
sys/nfsclient/krpc_subr.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */
/* $Id: krpc_subr.c,v 1.4 1997/08/16 19:15:53 wollman Exp $ */
/* $Id: krpc_subr.c,v 1.5 1997/09/02 01:19:26 bde Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@ -48,8 +48,8 @@
#include <sys/conf.h>
#include <sys/sockio.h>
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/mbuf.h>
#include <sys/reboot.h>
#include <sys/socket.h>

13
sys/nfsclient/nfs.h
View File

@ -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)| \

6
sys/nfsclient/nfs_nfsiod.c
View File

@ -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,

4
sys/nfsclient/nfs_node.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
* $Id: nfs_node.c,v 1.19 1997/09/21 04:23:45 dyson Exp $
* $Id: nfs_node.c,v 1.20 1997/10/11 18:31:34 phk Exp $
*/
@ -51,7 +51,7 @@
#include <nfs/nfsnode.h>
#include <nfs/nfsmount.h>
MALLOC_DEFINE(M_NFSNODE, "NFS node", "NFS vnode private part");
static MALLOC_DEFINE(M_NFSNODE, "NFS node", "NFS vnode private part");
LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl;
u_long nfsnodehash;

4
sys/nfsclient/nfs_socket.c
View File

@ -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>

13
sys/nfsclient/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
* $Id: nfs_vfsops.c,v 1.47 1997/09/07 12:56:44 bde Exp $
* $Id: nfs_vfsops.c,v 1.48 1997/09/10 19:52:26 phk Exp $
*/
#include <sys/param.h>
@ -46,9 +46,9 @@
#include <sys/vnode.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/buf.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
@ -76,6 +76,15 @@ extern int nfs_mountroot __P((struct mount *mp));
extern int nfs_ticks;
MALLOC_DEFINE(M_NFSREQ, "NFS req", "NFS request header");
MALLOC_DEFINE(M_NFSMNT, "NFS mount", "NFS mount structure");
MALLOC_DEFINE(M_NFSBIGFH, "NFSV3 bigfh", "NFS version 3 file handle");
MALLOC_DEFINE(M_NFSD, "NFS daemon", "Nfs server daemon structure");
MALLOC_DEFINE(M_NFSDIROFF, "NFSV3 diroff", "NFS directory offset data");
MALLOC_DEFINE(M_NFSRVDESC, "NFSV3 srvdesc", "NFS server socket descriptor");
MALLOC_DEFINE(M_NFSUID, "NFS uid", "Nfs uid mapping structure");
MALLOC_DEFINE(M_NQLEASE, "NQNFS Lease", "Nqnfs lease");
struct nfsstats nfsstats;
SYSCTL_NODE(_vfs, MOUNT_NFS, nfs, CTLFLAG_RW, 0, "NFS filesystem");
SYSCTL_STRUCT(_vfs_nfs, NFS_NFSSTATS, nfsstats, CTLFLAG_RD,

13
sys/nfsclient/nfsargs.h
View File

@ -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)| \

13
sys/nfsclient/nfsstats.h
View File

@ -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)| \

13
sys/nfsserver/nfs.h
View File

@ -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)| \

4
sys/nfsserver/nfs_srvcache.c
View File

@ -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 */

4
sys/nfsserver/nfs_srvsock.c
View File

@ -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>

Some files were not shown because too many files have changed in this diff Show More