From 5bb84bc84b1d1f978dd93aa02acef9936e79abc0 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 31 Oct 2005 15:41:29 +0000 Subject: Normalize a significant number of kernel malloc type names: - Prefer '_' to ' ', as it results in more easily parsed results in memory monitoring tools such as vmstat. - Remove punctuation that is incompatible with using memory type names as file names, such as '/' characters. - Disambiguate some collisions by adding subsystem prefixes to some memory types. - Generally prefer lower case to upper case. - If the same type is defined in multiple architecture directories, attempt to use the same name in additional cases. Not all instances were caught in this change, so more work is required to finish this conversion. Similar changes are required for UMA zone names. --- sys/gnu/fs/ext2fs/ext2_vfsops.c | 4 ++-- sys/gnu/fs/reiserfs/reiserfs_namei.c | 2 +- sys/gnu/fs/reiserfs/reiserfs_vfsops.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/gnu') diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 84d1809b1419..400b308a319a 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -94,8 +94,8 @@ static vfs_fhtovp_t ext2_fhtovp; static vfs_vptofh_t ext2_vptofh; static vfs_mount_t ext2_mount; -MALLOC_DEFINE(M_EXT2NODE, "EXT2 node", "EXT2 vnode private part"); -static MALLOC_DEFINE(M_EXT2MNT, "EXT2 mount", "EXT2 mount structure"); +MALLOC_DEFINE(M_EXT2NODE, "ext2_node", "EXT2 vnode private part"); +static MALLOC_DEFINE(M_EXT2MNT, "ext2_mount", "EXT2 mount structure"); static struct vfsops ext2fs_vfsops = { .vfs_fhtovp = ext2_fhtovp, diff --git a/sys/gnu/fs/reiserfs/reiserfs_namei.c b/sys/gnu/fs/reiserfs/reiserfs_namei.c index 6ab714a91c0d..88ad880baa5d 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_namei.c +++ b/sys/gnu/fs/reiserfs/reiserfs_namei.c @@ -13,7 +13,7 @@ static int reiserfs_find_entry(struct reiserfs_node *dp, const char *name, int namelen, struct path * path_to_entry, struct reiserfs_dir_entry *de); -MALLOC_DEFINE(M_REISERFSCOOKIES, "ReiserFS cookies", +MALLOC_DEFINE(M_REISERFSCOOKIES, "reiserfs_cookies", "ReiserFS VOP_READDIR cookies"); /* ------------------------------------------------------------------- diff --git a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c index db9511260ee0..2aaf663e98c4 100644 --- a/sys/gnu/fs/reiserfs/reiserfs_vfsops.c +++ b/sys/gnu/fs/reiserfs/reiserfs_vfsops.c @@ -41,9 +41,9 @@ static int get_root_node(struct reiserfs_mount *rmp, struct reiserfs_node **root); uint32_t find_hash_out(struct reiserfs_mount *rmp); -MALLOC_DEFINE(M_REISERFSMNT, "ReiserFS mount", "ReiserFS mount structure"); -MALLOC_DEFINE(M_REISERFSPATH, "ReiserFS path", "ReiserFS path structure"); -MALLOC_DEFINE(M_REISERFSNODE, "ReiserFS node", "ReiserFS vnode private part"); +MALLOC_DEFINE(M_REISERFSMNT, "reiserfs_mount", "ReiserFS mount structure"); +MALLOC_DEFINE(M_REISERFSPATH, "reiserfs_path", "ReiserFS path structure"); +MALLOC_DEFINE(M_REISERFSNODE, "reiserfs_node", "ReiserFS vnode private part"); /* ------------------------------------------------------------------- * VFS operations -- cgit v1.3