diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-10-12 20:26:33 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-10-12 20:26:33 +0000 |
| commit | a1c995b626fc56226f7c279f087b50769ff8df18 (patch) | |
| tree | 26917801933240b41539e26bd8cb5dc27d8597a1 /sys/gnu | |
| parent | 175dffc0f66eae582032914b7ecddc666edd4e83 (diff) | |
Notes
Diffstat (limited to 'sys/gnu')
| -rw-r--r-- | sys/gnu/ext2fs/ext2_ihash.c | 5 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_mount.h | 7 | ||||
| -rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_mount.h | 7 | ||||
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 2 |
5 files changed, 17 insertions, 6 deletions
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c index 5ff8f341c172..83b29d4d58e5 100644 --- a/sys/gnu/ext2fs/ext2_ihash.c +++ b/sys/gnu/ext2fs/ext2_ihash.c @@ -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); } diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h index 2761f65a3574..d57dd59c8936 100644 --- a/sys/gnu/ext2fs/ext2_mount.h +++ b/sys/gnu/ext2fs/ext2_mount.h @@ -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; diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index 950d636b3379..39554f80db98 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -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, diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h index 2761f65a3574..d57dd59c8936 100644 --- a/sys/gnu/fs/ext2fs/ext2_mount.h +++ b/sys/gnu/fs/ext2fs/ext2_mount.h @@ -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; diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 950d636b3379..39554f80db98 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -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, |