diff options
86 files changed, 115 insertions, 114 deletions
diff --git a/sys/amd64/acpica/madt.c b/sys/amd64/acpica/madt.c index 42daf6b..3af0b73 100644 --- a/sys/amd64/acpica/madt.c +++ b/sys/amd64/acpica/madt.c @@ -74,7 +74,7 @@ static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; -MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items"); +MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); diff --git a/sys/amd64/amd64/io_apic.c b/sys/amd64/amd64/io_apic.c index 32d25e2..423a214 100644 --- a/sys/amd64/amd64/io_apic.c +++ b/sys/amd64/amd64/io_apic.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); /* * New interrupt support code.. diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 5ce5c79..d860dba 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -141,7 +141,7 @@ static bus_datum *busses; static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; -static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items"); +static MALLOC_DEFINE(M_MPTABLE, "mptable", "MP Table Items"); static enum intr_polarity conforming_polarity(u_char src_bus, u_char src_bus_irq); diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c index 6114a06..8998c4e 100644 --- a/sys/arm/arm/vm_machdep.c +++ b/sys/arm/arm/vm_machdep.c @@ -378,7 +378,7 @@ extern uma_zone_t l2zone; struct mtx smallalloc_mtx; -MALLOC_DEFINE(M_VMSMALLALLOC, "VM Small alloc", "VM Small alloc data"); +MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); vm_offset_t alloc_curaddr; vm_offset_t alloc_firstaddr; diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index c73d364..6effea7 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include <coda/coda_subr.h> #include <coda/coda_opstats.h> -MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); +MALLOC_DEFINE(M_CODA, "coda", "Various Coda Structures"); int codadebug = 0; int coda_vfsop_print_entry = 0; diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c index 4ee0d3b..6c87f54 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c @@ -112,7 +112,7 @@ extern int path_mtu_discovery; #endif # ifdef IPFILTER_M_IPFILTER -MALLOC_DEFINE(M_IPFILTER, "IP Filter", "IP Filter packet filter data structures"); +MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures"); # endif diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 3062281..d7d1f63 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -119,7 +119,7 @@ struct link_res_request { int link_index; }; -MALLOC_DEFINE(M_PCI_LINK, "PCI Link", "ACPI PCI Link structures"); +MALLOC_DEFINE(M_PCI_LINK, "pci_link", "ACPI PCI Link structures"); static int pci_link_interrupt_weights[NUM_ACPI_INTERRUPTS]; static int pci_link_bios_isa_irqs; diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 023e41d..41fe0bf 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -73,7 +73,7 @@ static void btrim(int8_t *, int); static void bpack(int8_t *, int8_t *, int); /* global vars */ -MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer"); +MALLOC_DEFINE(M_ATA, "ata_generic", "ATA driver generic layer"); int (*ata_raid_ioctl_func)(u_long cmd, caddr_t data) = NULL; devclass_t ata_devclass; uma_zone_t ata_request_zone; diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c index 1a79dc1..a71c0db 100644 --- a/sys/dev/ata/ata-disk.c +++ b/sys/dev/ata/ata-disk.c @@ -65,7 +65,7 @@ static disk_ioctl_t ad_ioctl; static dumper_t ad_dump; /* local vars */ -static MALLOC_DEFINE(M_AD, "AD driver", "ATA disk driver"); +static MALLOC_DEFINE(M_AD, "ad_driver", "ATA disk driver"); static int ad_probe(device_t dev) diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c index 4032a48..2526fcc 100644 --- a/sys/dev/ata/ata-dma.c +++ b/sys/dev/ata/ata-dma.c @@ -54,7 +54,7 @@ static int ata_dmaload(device_t, caddr_t, int32_t, int, void *, int *); static int ata_dmaunload(device_t); /* local vars */ -static MALLOC_DEFINE(M_ATADMA, "ATA DMA", "ATA driver DMA"); +static MALLOC_DEFINE(M_ATADMA, "ata_dma", "ATA driver DMA"); /* misc defines */ #define MAXTABSZ PAGE_SIZE diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 43a0a0a..7eb356d 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$"); #include <ata_if.h> /* local vars */ -static MALLOC_DEFINE(M_ATAPCI, "ATA PCI", "ATA driver PCI"); +static MALLOC_DEFINE(M_ATAPCI, "ata_pci", "ATA driver PCI"); /* misc defines */ #define IOMASK 0xfffffffc diff --git a/sys/dev/ata/ata-raid.c b/sys/dev/ata/ata-raid.c index d9ac7c0..369ba94 100644 --- a/sys/dev/ata/ata-raid.c +++ b/sys/dev/ata/ata-raid.c @@ -101,7 +101,7 @@ static void ata_raid_via_print_meta(struct via_raid_conf *meta); /* internal vars */ static struct ar_softc *ata_raid_arrays[MAX_ARRAYS]; -static MALLOC_DEFINE(M_AR, "AR driver", "ATA PseudoRAID driver"); +static MALLOC_DEFINE(M_AR, "ar_driver", "ATA PseudoRAID driver"); static devclass_t ata_raid_sub_devclass; static int testing = 0; diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c index 3493837..386de14 100644 --- a/sys/dev/ata/atapi-cam.c +++ b/sys/dev/ata/atapi-cam.c @@ -115,7 +115,7 @@ static struct atapi_hcb *allocate_hcb(struct atapi_xpt_softc *, int, int, union static void free_hcb(struct atapi_hcb *hcb); static void free_softc(struct atapi_xpt_softc *scp); -static MALLOC_DEFINE(M_ATACAM, "ATA CAM transport", "ATA driver CAM-XPT layer"); +static MALLOC_DEFINE(M_ATACAM, "ata_cam", "ATA driver CAM-XPT layer"); static device_method_t atapi_cam_methods[] = { DEVMETHOD(device_identify, atapi_cam_identify), diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index f2618fd..c33b234 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -94,7 +94,7 @@ static int acd_format(device_t, struct cdr_format_params *); static int acd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers"); +static MALLOC_DEFINE(M_ACD, "acd_driver", "ATAPI CD driver buffers"); static struct g_class acd_class = { .name = "ACD", .version = G_VERSION, diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c index 00c53ac..c9b3522 100644 --- a/sys/dev/ata/atapi-fd.c +++ b/sys/dev/ata/atapi-fd.c @@ -61,7 +61,7 @@ static int afd_prevent_allow(device_t, int); static int afd_test_ready(device_t); /* internal vars */ -static MALLOC_DEFINE(M_AFD, "AFD driver", "ATAPI floppy driver buffers"); +static MALLOC_DEFINE(M_AFD, "afd_driver", "ATAPI floppy driver buffers"); static int afd_probe(device_t dev) diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c index b06ce47..780f93d 100644 --- a/sys/dev/ata/atapi-tape.c +++ b/sys/dev/ata/atapi-tape.c @@ -85,7 +85,7 @@ static int ast_wait_dsc(device_t, int); /* internal vars */ static u_int64_t ast_total = 0; -static MALLOC_DEFINE(M_AST, "AST driver", "ATAPI tape driver buffers"); +static MALLOC_DEFINE(M_AST, "ast_driver", "ATAPI tape driver buffers"); static int ast_probe(device_t dev) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index ac61775..d811f93 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -94,8 +94,8 @@ #define MD_NSECT (10000 * 2) #endif -static MALLOC_DEFINE(M_MD, "MD disk", "Memory Disk"); -static MALLOC_DEFINE(M_MDSECT, "MD sectors", "Memory Disk Sectors"); +static MALLOC_DEFINE(M_MD, "md_disk", "Memory Disk"); +static MALLOC_DEFINE(M_MDSECT, "md_sectors", "Memory Disk Sectors"); static int md_debug; SYSCTL_INT(_debug, OID_AUTO, mddebug, CTLFLAG_RW, &md_debug, 0, ""); diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c index c0d7125..5d07354 100644 --- a/sys/dev/tdfx/tdfx_pci.c +++ b/sys/dev/tdfx/tdfx_pci.c @@ -96,7 +96,7 @@ static device_method_t tdfx_methods[] = { { 0, 0 } }; -MALLOC_DEFINE(M_TDFX,"TDFX Driver","3DFX Graphics[/2D]/3D Accelerator(s)"); +MALLOC_DEFINE(M_TDFX,"tdfx_driver","3DFX Graphics[/2D]/3D Accelerator(s)"); #ifdef TDFX_LINUX MODULE_DEPEND(tdfx, linux, 1, 1, 1); diff --git a/sys/dev/twa/tw_osl_freebsd.c b/sys/dev/twa/tw_osl_freebsd.c index 76e790a..154fd89 100644 --- a/sys/dev/twa/tw_osl_freebsd.c +++ b/sys/dev/twa/tw_osl_freebsd.c @@ -52,7 +52,7 @@ TW_INT32 TW_DEBUG_LEVEL_FOR_OSL = TW_OSL_DEBUG; TW_INT32 TW_OSL_DEBUG_LEVEL_FOR_CL = TW_OSL_DEBUG; #endif /* TW_OSL_DEBUG */ -MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa commands", "twa commands"); +MALLOC_DEFINE(TW_OSLI_MALLOC_CLASS, "twa_commands", "twa commands"); static d_open_t twa_open; diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c index addc7f4..aab15fb 100644 --- a/sys/dev/twe/twe_freebsd.c +++ b/sys/dev/twe/twe_freebsd.c @@ -866,7 +866,7 @@ twed_detach(device_t dev) /******************************************************************************** * Allocate a command buffer */ -MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe commands", "twe commands"); +MALLOC_DEFINE(TWE_MALLOC_CLASS, "twe_commands", "twe commands"); struct twe_request * twe_allocate_request(struct twe_softc *sc, int tag) diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 5eec0c9..b68e59e 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$"); #include <geom/geom.h> #include <geom/geom_vfs.h> -MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure"); -MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part"); +MALLOC_DEFINE(M_ISOFSMNT, "isofs_mount", "ISOFS mount structure"); +MALLOC_DEFINE(M_ISOFSNODE, "isofs_node", "ISOFS vnode private part"); struct iconv_functions *cd9660_iconv = NULL; diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index c73d364..6effea7 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include <coda/coda_subr.h> #include <coda/coda_opstats.h> -MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); +MALLOC_DEFINE(M_CODA, "coda", "Various Coda Structures"); int codadebug = 0; int coda_vfsop_print_entry = 0; diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index ebd17a4..c175d0a 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -52,7 +52,7 @@ #include <fs/fdescfs/fdesc.h> -static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure"); +static MALLOC_DEFINE(M_FDESCMNT, "fdesc_mount", "FDESC mount structure"); static vfs_mount_t fdesc_mount; static vfs_unmount_t fdesc_unmount; diff --git a/sys/fs/hpfs/hpfs_vfsops.c b/sys/fs/hpfs/hpfs_vfsops.c index b07898d..cc43fe6 100644 --- a/sys/fs/hpfs/hpfs_vfsops.c +++ b/sys/fs/hpfs/hpfs_vfsops.c @@ -53,8 +53,8 @@ #include <fs/hpfs/hpfsmount.h> #include <fs/hpfs/hpfs_subr.h> -MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure"); -MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure"); +MALLOC_DEFINE(M_HPFSMNT, "hpfs_mount", "HPFS mount structure"); +MALLOC_DEFINE(M_HPFSNO, "hpfs_node", "HPFS node structure"); struct sockaddr; diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 449d3dd..effc20b 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -67,7 +67,7 @@ #include <fs/msdosfs/denode.h> #include <fs/msdosfs/fat.h> -static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part"); +static MALLOC_DEFINE(M_MSDOSFSNODE, "msdosfs_node", "MSDOSFS vnode private part"); static int de_vncmpf(struct vnode *vp, void *arg) diff --git a/sys/fs/msdosfs/msdosfs_fileno.c b/sys/fs/msdosfs/msdosfs_fileno.c index ad6d4a7..1961882 100644 --- a/sys/fs/msdosfs/msdosfs_fileno.c +++ b/sys/fs/msdosfs/msdosfs_fileno.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include <fs/msdosfs/msdosfsmount.h> #include <fs/msdosfs/direntry.h> -static MALLOC_DEFINE(M_MSDOSFSFILENO, "MSDOSFS fileno", "MSDOSFS fileno mapping node"); +static MALLOC_DEFINE(M_MSDOSFSFILENO, "msdosfs_fileno", "MSDOSFS fileno mapping node"); static struct mtx fileno_mtx; MTX_SYSINIT(fileno, &fileno_mtx, "MSDOSFS fileno", MTX_DEF); diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index bc59b44..fcb136d 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -99,8 +99,8 @@ static const char *msdosfs_opts[] = { #define MSDOSFS_NOCHECKSIG #endif -MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure"); -static 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"); struct iconv_functions *msdosfs_iconv = NULL; diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c index a84574e..e684d39 100644 --- a/sys/fs/ntfs/ntfs_ihash.c +++ b/sys/fs/ntfs/ntfs_ihash.c @@ -45,7 +45,7 @@ #include <fs/ntfs/ntfs_inode.h> #include <fs/ntfs/ntfs_ihash.h> -MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables"); +MALLOC_DEFINE(M_NTFSNTHASH, "ntfs_nthash", "NTFS ntnode hash tables"); /* * Structures associated with inode cacheing. diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index a4db53a..adbe8c643 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -51,10 +51,10 @@ #include <fs/ntfs/ntfs_compr.h> #include <fs/ntfs/ntfs_ihash.h> -MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information"); -MALLOC_DEFINE(M_NTFSRDATA, "NTFS res data", "NTFS resident data"); -MALLOC_DEFINE(M_NTFSRUN, "NTFS vrun", "NTFS vrun storage"); -MALLOC_DEFINE(M_NTFSDECOMP, "NTFS decomp", "NTFS decompression temporary"); +MALLOC_DEFINE(M_NTFSNTVATTR, "ntfs_vattr", "NTFS file attribute information"); +MALLOC_DEFINE(M_NTFSRDATA, "ntfsd_resdata", "NTFS resident data"); +MALLOC_DEFINE(M_NTFSRUN, "ntfs_vrun", "NTFS vrun storage"); +MALLOC_DEFINE(M_NTFSDECOMP, "ntfs_decomp", "NTFS decompression temporary"); static int ntfs_ntlookupattr(struct ntfsmount *, const char *, int, int *, char **); static int ntfs_findvattr(struct ntfsmount *, struct ntnode *, struct ntvattr **, struct ntvattr **, u_int32_t, const char *, size_t, cn_t); diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c index 5e8973c..b670318 100644 --- a/sys/fs/ntfs/ntfs_vfsops.c +++ b/sys/fs/ntfs/ntfs_vfsops.c @@ -60,10 +60,10 @@ #include <fs/ntfs/ntfs_ihash.h> #include <fs/ntfs/ntfsmount.h> -static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); -MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information"); -MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information"); -MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer"); +static MALLOC_DEFINE(M_NTFSMNT, "ntfs_mount", "NTFS mount structure"); +MALLOC_DEFINE(M_NTFSNTNODE,"ntfs_ntnode", "NTFS ntnode information"); +MALLOC_DEFINE(M_NTFSFNODE,"ntfs_fnode", "NTFS fnode information"); +MALLOC_DEFINE(M_NTFSDIR,"ntfs_dir", "NTFS dir buffer"); struct sockaddr; diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index f0ab73a..a5a45ea 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -64,8 +64,8 @@ static LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; static u_long null_node_hash; struct mtx null_hashmtx; -static MALLOC_DEFINE(M_NULLFSHASH, "NULLFS hash", "NULLFS hash table"); -MALLOC_DEFINE(M_NULLFSNODE, "NULLFS node", "NULLFS vnode private part"); +static MALLOC_DEFINE(M_NULLFSHASH, "nullfs_hash", "NULLFS hash table"); +MALLOC_DEFINE(M_NULLFSNODE, "nullfs_node", "NULLFS vnode private part"); static struct vnode * null_hashget(struct mount *, struct vnode *); static struct vnode * null_hashins(struct mount *, struct null_node *); diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 2d3ac6e..bb5e8b7 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -53,7 +53,7 @@ #include <fs/nullfs/null.h> -static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure"); +static MALLOC_DEFINE(M_NULLFSMNT, "nullfs_mount", "NULLFS mount structure"); static vfs_fhtovp_t nullfs_fhtovp; static vfs_checkexp_t nullfs_checkexp; diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index 29ce5d3..510f174 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -64,8 +64,8 @@ static LIST_HEAD(nwnode_hash_head,nwnode) *nwhashtbl; static u_long nwnodehash; static struct lock nwhashlock; -static MALLOC_DEFINE(M_NWNODE, "NWFS node", "NWFS vnode private part"); -static MALLOC_DEFINE(M_NWFSHASH, "NWFS hash", "NWFS has table"); +static MALLOC_DEFINE(M_NWNODE, "nwfs_node", "NWFS vnode private part"); +static MALLOC_DEFINE(M_NWFSHASH, "nwfs_hash", "NWFS has table"); static int nwfs_sysctl_vnprint(SYSCTL_HANDLER_ARGS); diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c index 4a2c65c..e983b13 100644 --- a/sys/fs/nwfs/nwfs_subr.c +++ b/sys/fs/nwfs/nwfs_subr.c @@ -52,7 +52,7 @@ #define NCP_INFOSZ (sizeof(struct nw_entry_info) - 257) -MALLOC_DEFINE(M_NWFSDATA, "NWFS data", "NWFS private data"); +MALLOC_DEFINE(M_NWFSDATA, "nwfs_data", "NWFS private data"); static int ncp_extract_file_info(struct nwmount *nmp, struct ncp_rq *rqp, diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c index a106544..ed2022e 100644 --- a/sys/fs/portalfs/portal_vfsops.c +++ b/sys/fs/portalfs/portal_vfsops.c @@ -56,7 +56,7 @@ #include <fs/portalfs/portal.h> -static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure"); +static MALLOC_DEFINE(M_PORTALFSMNT, "portal_mount", "PORTAL mount structure"); static vfs_unmount_t portal_unmount; static vfs_root_t portal_root; diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 7ad977b..d48bdb76 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -64,8 +64,8 @@ extern struct vop_vector smbfs_vnodeops; /* XXX -> .h file */ -MALLOC_DEFINE(M_SMBNODE, "SMBFS node", "SMBFS vnode private part"); -static MALLOC_DEFINE(M_SMBNODENAME, "SMBFS nname", "SMBFS node name"); +MALLOC_DEFINE(M_SMBNODE, "smbufs_node", "SMBFS vnode private part"); +static MALLOC_DEFINE(M_SMBNODENAME, "smbufs_nname", "SMBFS node name"); int smbfs_hashprint(struct mount *mp); diff --git a/sys/fs/smbfs/smbfs_subr.c b/sys/fs/smbfs/smbfs_subr.c index a91cc79..b368867 100644 --- a/sys/fs/smbfs/smbfs_subr.c +++ b/sys/fs/smbfs/smbfs_subr.c @@ -51,7 +51,7 @@ #include <fs/smbfs/smbfs_node.h> #include <fs/smbfs/smbfs_subr.h> -MALLOC_DEFINE(M_SMBFSDATA, "SMBFS data", "SMBFS private data"); +MALLOC_DEFINE(M_SMBFSDATA, "smbfs_data", "SMBFS private data"); /* * Time & date conversion routines taken from msdosfs. Although leap diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index 5c093c1..aed0c72 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -70,7 +70,7 @@ SYSCTL_NODE(_vfs, OID_AUTO, smbfs, CTLFLAG_RW, 0, "SMB/CIFS filesystem"); SYSCTL_INT(_vfs_smbfs, OID_AUTO, version, CTLFLAG_RD, &smbfs_version, 0, ""); SYSCTL_INT(_vfs_smbfs, OID_AUTO, debuglevel, CTLFLAG_RW, &smbfs_debuglevel, 0, ""); -static MALLOC_DEFINE(M_SMBFSHASH, "SMBFS hash", "SMBFS hash table"); +static MALLOC_DEFINE(M_SMBFSHASH, "smbfs_hash", "SMBFS hash table"); static vfs_init_t smbfs_init; static vfs_uninit_t smbfs_uninit; diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 890be05..5609d16 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -99,8 +99,8 @@ #include <fs/udf/udf.h> #include <fs/udf/udf_mount.h> -static MALLOC_DEFINE(M_UDFMOUNT, "UDF mount", "UDF mount structure"); -MALLOC_DEFINE(M_UDFFENTRY, "UDF fentry", "UDF file entry structure"); +static MALLOC_DEFINE(M_UDFMOUNT, "udf_mount", "UDF mount structure"); +MALLOC_DEFINE(M_UDFFENTRY, "udf_fentry", "UDF file entry structure"); struct iconv_functions *udf_iconv = NULL; diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index cd0dc07..5aa356f 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -88,8 +88,8 @@ static struct vop_vector udf_vnodeops = { .vop_strategy = udf_strategy, }; -MALLOC_DEFINE(M_UDFFID, "UDF FID", "UDF FileId structure"); -MALLOC_DEFINE(M_UDFDS, "UDF DS", "UDF Dirstream structure"); +MALLOC_DEFINE(M_UDFFID, "udf_fid", "UDF FileId structure"); +MALLOC_DEFINE(M_UDFDS, "udf_ds", "UDF Dirstream structure"); #define UDF_INVALID_BMAP -1 diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c index 1d3c74c..7d4d40c 100644 --- a/sys/fs/umapfs/umap_vfsops.c +++ b/sys/fs/umapfs/umap_vfsops.c @@ -51,7 +51,7 @@ #include <fs/umapfs/umap.h> -static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure"); +static MALLOC_DEFINE(M_UMAPFSMNT, "umap_mount", "UMAP mount structure"); static vfs_omount_t umapfs_omount; static vfs_root_t umapfs_root; diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 61c7883..0a65ea7 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -51,7 +51,7 @@ #include <sys/filedesc.h> #include <fs/unionfs/union.h> -static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure"); +static MALLOC_DEFINE(M_UNIONFSMNT, "union_mount", "UNION mount structure"); extern vfs_init_t union_init; static vfs_root_t union_root; diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c index e0e58ca..067156c 100644 --- a/sys/geom/bde/g_bde_work.c +++ b/sys/geom/bde/g_bde_work.c @@ -90,7 +90,7 @@ static void g_bde_purge_sector(struct g_bde_softc *sc, int fraction); static u_int g_bde_nwork; SYSCTL_UINT(_debug, OID_AUTO, gbde_nwork, CTLFLAG_RD, &g_bde_nwork, 0, ""); -static MALLOC_DEFINE(M_GBDE, "GBDE", "GBDE data structures"); +static MALLOC_DEFINE(M_GBDE, "gbde", "GBDE data structures"); static struct g_bde_work * g_bde_new_work(struct g_bde_softc *sc) diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index bb5b232..f2e980a 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include <geom/concat/g_concat.h> -static MALLOC_DEFINE(M_CONCAT, "concat data", "GEOM_CONCAT Data"); +static MALLOC_DEFINE(M_CONCAT, "concat_data", "GEOM_CONCAT Data"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, concat, CTLFLAG_RW, 0, "GEOM_CONCAT stuff"); diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c index 9734cbe..18dde68 100644 --- a/sys/geom/gate/g_gate.c +++ b/sys/geom/gate/g_gate.c @@ -48,7 +48,7 @@ #include <geom/geom.h> #include <geom/gate/g_gate.h> -static MALLOC_DEFINE(M_GATE, "gg data", "GEOM Gate Data"); +static MALLOC_DEFINE(M_GATE, "gg_data", "GEOM Gate Data"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, gate, CTLFLAG_RW, 0, "GEOM_GATE stuff"); diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 4d5af3f..b6b0040 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <geom/mirror/g_mirror.h> -static MALLOC_DEFINE(M_MIRROR, "mirror data", "GEOM_MIRROR Data"); +static MALLOC_DEFINE(M_MIRROR, "mirror_data", "GEOM_MIRROR Data"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, mirror, CTLFLAG_RW, 0, "GEOM_MIRROR stuff"); diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 65f4c0f..a16817d 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <geom/raid3/g_raid3.h> -static MALLOC_DEFINE(M_RAID3, "raid3 data", "GEOM_RAID3 Data"); +static MALLOC_DEFINE(M_RAID3, "raid3_data", "GEOM_RAID3 Data"); SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, raid3, CTLFLAG_RW, 0, "GEOM_RAID3 stuff"); diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c index acfa8fb..91e9814 100644 --- a/sys/geom/shsec/g_shsec.c +++ b/sys/geom/shsec/g_shsec.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <geom/shsec/g_shsec.h> -static MALLOC_DEFINE(M_SHSEC, "shsec data", "GEOM_SHSEC Data"); +static MALLOC_DEFINE(M_SHSEC, "shsec_data", "GEOM_SHSEC Data"); static uma_zone_t g_shsec_zone; diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c index eea2ad1..1590081 100644 --- a/sys/geom/stripe/g_stripe.c +++ b/sys/geom/stripe/g_stripe.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #define MAX_IO_SIZE (DFLTPHYS * 2) -static MALLOC_DEFINE(M_STRIPE, "stripe data", "GEOM_STRIPE Data"); +static MALLOC_DEFINE(M_STRIPE, "stripe_data", "GEOM_STRIPE Data"); static uma_zone_t g_stripe_zone; diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c index ae37353d..7fb5614 100644 --- a/sys/geom/uzip/g_uzip.c +++ b/sys/geom/uzip/g_uzip.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #define DPRINTF(a) #endif -MALLOC_DEFINE(M_GEOM_UZIP, "GEOM UZIP", "GEOM UZIP data structures"); +MALLOC_DEFINE(M_GEOM_UZIP, "geom_uzip", "GEOM UZIP data structures"); #define UZIP_CLASS_NAME "UZIP" diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index 84d1809..400b308 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 6ab714a..88ad880 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 db95112..2aaf663 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 diff --git a/sys/i386/acpica/madt.c b/sys/i386/acpica/madt.c index f9384f2..6b6a6e6 100644 --- a/sys/i386/acpica/madt.c +++ b/sys/i386/acpica/madt.c @@ -74,7 +74,7 @@ static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; -MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items"); +MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); diff --git a/sys/i386/i386/io_apic.c b/sys/i386/i386/io_apic.c index 27251ce..53a4678 100644 --- a/sys/i386/i386/io_apic.c +++ b/sys/i386/i386/io_apic.c @@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$"); #define TODO printf("%s: not implemented!\n", __func__) -static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures"); +static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures"); /* * New interrupt support code.. diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index cffeb1c..e3beda4 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -147,7 +147,7 @@ static bus_datum *busses; static int mptable_nioapics, mptable_nbusses, mptable_maxbusid; static int pci0 = -1; -static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items"); +static MALLOC_DEFINE(M_MPTABLE, "mptable", "MP Table Items"); static enum intr_polarity conforming_polarity(u_char src_bus, u_char src_bus_irq); diff --git a/sys/ia64/ia64/sscdisk.c b/sys/ia64/ia64/sscdisk.c index 6083071..72597d7 100644 --- a/sys/ia64/ia64/sscdisk.c +++ b/sys/ia64/ia64/sscdisk.c @@ -72,7 +72,7 @@ ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which) #define SSC_NSECT 409600 #endif -MALLOC_DEFINE(M_SSC, "SSC disk", "Simulator Disk"); +MALLOC_DEFINE(M_SSC, "ssc_disk", "Simulator Disk"); static int sscrootready; diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 5eec0c9..b68e59e 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -62,8 +62,8 @@ __FBSDID("$FreeBSD$"); #include <geom/geom.h> #include <geom/geom_vfs.h> -MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure"); -MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part"); +MALLOC_DEFINE(M_ISOFSMNT, "isofs_mount", "ISOFS mount structure"); +MALLOC_DEFINE(M_ISOFSNODE, "isofs_node", "ISOFS vnode private part"); struct iconv_functions *cd9660_iconv = NULL; diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index 9ac6364..383ebc4 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -20,7 +20,7 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #ifdef _KERNEL -static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees"); +static MALLOC_DEFINE(M_GZIP, "gzip_trees", "Gzip trees"); #endif /* needed to make inflate() work */ diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 25caa9f..5bf1553 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -69,8 +69,8 @@ __FBSDID("$FreeBSD$"); #include <vm/uma.h> -static MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table"); -static MALLOC_DEFINE(M_FILEDESC_TO_LEADER, "file desc to leader", +static MALLOC_DEFINE(M_FILEDESC, "filedesc", "Open file descriptor table"); +static MALLOC_DEFINE(M_FILEDESC_TO_LEADER, "filedesc_to_leader", "file desc to leader structures"); static MALLOC_DEFINE(M_SIGIO, "sigio", "sigio structures"); diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index 3def263..092c5c2 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -138,7 +138,7 @@ SYSCTL_UINT(_debug_sleepq, OID_AUTO, max_depth, CTLFLAG_RD, &sleepq_max_depth, #endif static struct sleepqueue_chain sleepq_chains[SC_TABLESIZE]; -static MALLOC_DEFINE(M_SLEEPQUEUE, "sleep queues", "sleep queues"); +static MALLOC_DEFINE(M_SLEEPQUEUE, "sleepqueue", "sleep queues"); /* * Prototypes for non-exported routines. diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 286f07c..439cd7d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1614,6 +1614,7 @@ unp_gc(void) LIST_FOREACH(fp, &filehead, f_list) fp->f_gcflag &= ~(FMARK|FDEFER); do { + KASSERT(unp_defer >= 0, ("unp_gc: unp_defer %d", unp_defer)); LIST_FOREACH(fp, &filehead, f_list) { FILE_LOCK(fp); /* diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index f475750..767504c 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); #include "opt_directio.h" #include "opt_swap.h" -static MALLOC_DEFINE(M_BIOBUF, "BIO buffer", "BIO buffer"); +static MALLOC_DEFINE(M_BIOBUF, "biobuf", "BIO buffer"); struct bio_ops bioops; /* I/O operation notification */ diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 01fa49e..885f1f9 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -58,7 +58,7 @@ SYSCTL_INT(_debug, OID_AUTO, rcluster, CTLFLAG_RW, &rcluster, 0, "Debug VFS clustering code"); #endif -static MALLOC_DEFINE(M_SEGMENT, "cluster_save buffer", "cluster_save buffer"); +static MALLOC_DEFINE(M_SEGMENT, "cluster_save_buffer", "cluster_save buffer"); static struct cluster_save * cluster_collectbufs(struct vnode *vp, struct buf *last_bp); diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 05e0f45..5552845 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$"); #include <net/radix.h> -static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static MALLOC_DEFINE(M_NETADDR, "export_host", "Export host address structure"); static void vfs_free_addrlist(struct netexport *nep); static int vfs_free_netcred(struct radix_node *rn, void *w); diff --git a/sys/kern/vfs_hash.c b/sys/kern/vfs_hash.c index c26c4c8..5523c56 100644 --- a/sys/kern/vfs_hash.c +++ b/sys/kern/vfs_hash.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/mount.h> #include <sys/vnode.h> -static MALLOC_DEFINE(M_VFS_HASH, "VFS hash", "VFS hash table"); +static MALLOC_DEFINE(M_VFS_HASH, "vfs_hash", "VFS hash table"); static LIST_HEAD(vfs_hash_head, vnode) *vfs_hash_tbl; static LIST_HEAD(,vnode) vfs_hash_side; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 32a630a..6ad6507 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_kern.h> #include <vm/uma.h> -static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static MALLOC_DEFINE(M_NETADDR, "subr_export_host", "Export host address structure"); static void delmntque(struct vnode *vp); static void insmntque(struct vnode *vp, struct mount *mp); diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c index 7010bb2..401252a 100644 --- a/sys/libkern/iconv.c +++ b/sys/libkern/iconv.c @@ -47,8 +47,8 @@ SYSCTL_DECL(_kern_iconv); SYSCTL_NODE(_kern, OID_AUTO, iconv, CTLFLAG_RW, NULL, "kernel iconv interface"); -MALLOC_DEFINE(M_ICONV, "ICONV", "ICONV structures"); -MALLOC_DEFINE(M_ICONVDATA, "ICONV data", "ICONV data"); +MALLOC_DEFINE(M_ICONV, "iconv", "ICONV structures"); +MALLOC_DEFINE(M_ICONVDATA, "iconv_data", "ICONV data"); MODULE_VERSION(libiconv, 2); diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c index 3227b6a..11965d0 100644 --- a/sys/netatm/ipatm/ipatm_if.c +++ b/sys/netatm/ipatm/ipatm_if.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include <netatm/ipatm/ipatm_var.h> #include <netatm/ipatm/ipatm_serv.h> -static MALLOC_DEFINE(M_IPATM_NIF, "ipatm nif", "IP/ATM network interfaces"); +static MALLOC_DEFINE(M_IPATM_NIF, "ipatm_nif", "IP/ATM network interfaces"); /* * Local functions diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index 4cf6353..92b4ef7 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$"); #include <netgraph/atm/ng_sscfu.h> #include <netgraph/atm/ng_uni.h> -MALLOC_DEFINE(M_NG_UNI, "netgraph_uni", "netgraph uni node"); -MALLOC_DEFINE(M_UNI, "netgraph uni", "uni protocol data"); +MALLOC_DEFINE(M_NG_UNI, "netgraph_uni_node", "netgraph uni node"); +MALLOC_DEFINE(M_UNI, "netgraph_uni_data", "uni protocol data"); MODULE_DEPEND(ng_uni, ngatmbase, 1, 1, 1); diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c index 1eba26a..327a5c6 100644 --- a/sys/netgraph/netflow/netflow.c +++ b/sys/netgraph/netflow/netflow.c @@ -96,7 +96,7 @@ static const char rcs_id[] = ((t) << 3)) /* 8 */ MALLOC_DECLARE(M_NETFLOW_HASH); -MALLOC_DEFINE(M_NETFLOW_HASH, "NetFlow hash", "NetFlow hash"); +MALLOC_DEFINE(M_NETFLOW_HASH, "netflow_hash", "NetFlow hash"); static int export_add(item_p, struct flow_entry *); static int export_send(priv_p, item_p); diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c index efe0cce..c1edfc5 100644 --- a/sys/netinet/ip_encap.c +++ b/sys/netinet/ip_encap.c @@ -91,7 +91,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> -static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); +static MALLOC_DEFINE(M_NETADDR, "encap_export_host", "Export host address structure"); static void encap_add(struct encaptab *); static int mask_match(const struct encaptab *, const struct sockaddr *, diff --git a/sys/netkey/keydb.c b/sys/netkey/keydb.c index 711ed7b..10fd8f6 100644 --- a/sys/netkey/keydb.c +++ b/sys/netkey/keydb.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include <net/net_osdep.h> -MALLOC_DEFINE(M_SECA, "key mgmt", "security associations, key management"); +MALLOC_DEFINE(M_SECA, "key_mgmt", "security associations, key management"); /* * secpolicy management diff --git a/sys/netncp/ncp_conn.c b/sys/netncp/ncp_conn.c index 2052b17..270f300 100644 --- a/sys/netncp/ncp_conn.c +++ b/sys/netncp/ncp_conn.c @@ -73,7 +73,7 @@ SYSCTL_INT (_net_ncp, OID_AUTO, conn_cnt, CTLFLAG_RD, &ncp_conn_cnt, 0, ""); SYSCTL_PROC(_net_ncp, OID_AUTO, conn_stat, CTLFLAG_RD|CTLTYPE_OPAQUE, NULL, 0, ncp_sysctl_connstat, "S,connstat", "Connections list"); -MALLOC_DEFINE(M_NCPDATA, "NCP data", "NCP private data"); +MALLOC_DEFINE(M_NCPDATA, "ncp_data", "NCP private data"); int ncp_conn_init(void) diff --git a/sys/netsmb/smb_conn.c b/sys/netsmb/smb_conn.c index 868fbaa..0791249 100644 --- a/sys/netsmb/smb_conn.c +++ b/sys/netsmb/smb_conn.c @@ -59,7 +59,7 @@ static int smb_vcnext = 1; /* next unique id for VC */ SYSCTL_NODE(_net, OID_AUTO, smb, CTLFLAG_RW, NULL, "SMB protocol"); -MALLOC_DEFINE(M_SMBCONN, "SMB conn", "SMB connection"); +MALLOC_DEFINE(M_SMBCONN, "smb_conn", "SMB connection"); static void smb_co_init(struct smb_connobj *cp, int level, char *objname, struct thread *td); diff --git a/sys/nfs4client/nfs4_dev.c b/sys/nfs4client/nfs4_dev.c index ab089b4..7f780a9 100644 --- a/sys/nfs4client/nfs4_dev.c +++ b/sys/nfs4client/nfs4_dev.c @@ -49,7 +49,7 @@ #define NFS4DEV_NAME "nfs4" #define CDEV_MINOR 1 -MALLOC_DEFINE(M_NFS4DEV, "NFS4 dev", "NFS4 device"); +MALLOC_DEFINE(M_NFS4DEV, "nfs4_dev", "NFS4 device"); struct nfs4dev_upcall { /* request msg */ diff --git a/sys/nfsclient/nfs_lock.c b/sys/nfsclient/nfs_lock.c index ec021e9..3a72df1 100644 --- a/sys/nfsclient/nfs_lock.c +++ b/sys/nfsclient/nfs_lock.c @@ -64,8 +64,8 @@ __FBSDID("$FreeBSD$"); extern void (*nlminfo_release_p)(struct proc *p); -MALLOC_DEFINE(M_NFSLOCK, "NFS lock", "NFS lock request"); -MALLOC_DEFINE(M_NLMINFO, "nlminfo", "NFS lock process structure"); +MALLOC_DEFINE(M_NFSLOCK, "nfsclient_lock", "NFS lock request"); +MALLOC_DEFINE(M_NLMINFO, "nfsclient_nlminfo", "NFS lock process structure"); static int nfslockdans(struct thread *td, struct lockd_ans *ansp); static void nlminfo_release(struct proc *p); diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c index 8740fb8..4317989 100644 --- a/sys/nfsclient/nfs_nfsiod.c +++ b/sys/nfsclient/nfs_nfsiod.c @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include <nfsclient/nfsnode.h> #include <nfsclient/nfs_lock.h> -static MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure"); +static MALLOC_DEFINE(M_NFSSVC, "nfsclient_srvsock", "Nfs server structure"); static void nfssvc_iod(void *); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 9cf9b2b..6f1db8d 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -75,11 +75,11 @@ __FBSDID("$FreeBSD$"); #include <nfsclient/nfsm_subs.h> #include <nfsclient/nfsdiskless.h> -MALLOC_DEFINE(M_NFSREQ, "NFS req", "NFS request header"); -MALLOC_DEFINE(M_NFSBIGFH, "NFSV3 bigfh", "NFS version 3 file handle"); -MALLOC_DEFINE(M_NFSDIROFF, "NFSV3 diroff", "NFS directory offset data"); -MALLOC_DEFINE(M_NFSHASH, "NFS hash", "NFS hash tables"); -MALLOC_DEFINE(M_NFSDIRECTIO, "NFS DirectIO", "NFS Direct IO async write state"); +MALLOC_DEFINE(M_NFSREQ, "nfsclient_req", "NFS request header"); +MALLOC_DEFINE(M_NFSBIGFH, "nfsclient_bigfh", "NFS version 3 file handle"); +MALLOC_DEFINE(M_NFSDIROFF, "nfsclient_diroff", "NFS directory offset data"); +MALLOC_DEFINE(M_NFSHASH, "nfsclient_hash", "NFS hash tables"); +MALLOC_DEFINE(M_NFSDIRECTIO, "nfsclient_directio", "NFS Direct IO async write state"); uma_zone_t nfsmount_zone; diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index 8b2f820..430c4d1 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -74,10 +74,10 @@ __FBSDID("$FreeBSD$"); #include <nfsserver/nfsm_subs.h> #include <nfsserver/nfsrvcache.h> -static MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure"); +static MALLOC_DEFINE(M_NFSSVC, "nfsserver_srvsock", "Nfs server structure"); -MALLOC_DEFINE(M_NFSRVDESC, "NFSV3 srvdesc", "NFS server socket descriptor"); -MALLOC_DEFINE(M_NFSD, "NFS daemon", "Nfs server daemon structure"); +MALLOC_DEFINE(M_NFSRVDESC, "nfsserver_srvdesc", "NFS server socket descriptor"); +MALLOC_DEFINE(M_NFSD, "nfsserver_daemon", "Nfs server daemon structure"); #define TRUE 1 diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index bcffa92..b68fd25 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -132,7 +132,7 @@ static int mac_lomac_slot; LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr) #define PSLOT_SET(l, val) (LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr = (val)) -MALLOC_DEFINE(M_MACLOMAC, "lomac label", "MAC/LOMAC labels"); +MALLOC_DEFINE(M_MACLOMAC, "mac_lomac_label", "MAC/LOMAC labels"); static struct mac_lomac * lomac_alloc(int flag) diff --git a/sys/security/mac_portacl/mac_portacl.c b/sys/security/mac_portacl/mac_portacl.c index 07dd147..589ba67 100644 --- a/sys/security/mac_portacl/mac_portacl.c +++ b/sys/security/mac_portacl/mac_portacl.c @@ -113,7 +113,7 @@ SYSCTL_INT(_security_mac_portacl, OID_AUTO, port_high, CTLFLAG_RW, &mac_portacl_port_high, 0, "Highest port to enforce for"); TUNABLE_INT("security.mac.portacl.port_high", &mac_portacl_port_high); -MALLOC_DEFINE(M_PORTACL, "portacl rule", "Rules for mac_portacl"); +MALLOC_DEFINE(M_PORTACL, "mac_portacl_rule", "Rules for mac_portacl"); #define MAC_RULE_STRING_LEN 1024 diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c index d15bae1..093e195 100644 --- a/sys/ufs/ufs/ufs_dirhash.c +++ b/sys/ufs/ufs/ufs_dirhash.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #define OFSFMT(vp) ((vp)->v_mount->mnt_maxsymlinklen <= 0) #define BLKFREE2IDX(n) ((n) > DH_NFSTATS ? DH_NFSTATS : (n)) -static MALLOC_DEFINE(M_DIRHASH, "UFS dirhash", "UFS directory hash tables"); +static MALLOC_DEFINE(M_DIRHASH, "ufs_dirhash", "UFS directory hash tables"); static SYSCTL_NODE(_vfs, OID_AUTO, ufs, CTLFLAG_RD, 0, "UFS filesystem"); diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 8c703ba..837d0c4 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -62,7 +62,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_get_quota, CTLFLAG_RW, &unprivileged_get_quota, 0, "Unprivileged processes may retrieve quotas for other uids and gids"); -static MALLOC_DEFINE(M_DQUOT, "UFS quota", "UFS quota entries"); +static MALLOC_DEFINE(M_DQUOT, "ufs_quota", "UFS quota entries"); /* * Quota name to error message mapping. diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index 75b1d0d..ff81bf8 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$"); #include <ufs/ufs/dirhash.h> #endif -MALLOC_DEFINE(M_UFSMNT, "UFS mount", "UFS mount structure"); +MALLOC_DEFINE(M_UFSMNT, "ufs_mount", "UFS mount structure"); /* * Return the root of a filesystem. diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index d6025ab..28bd135 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_pager.h> #include <vm/vm_extern.h> -MALLOC_DEFINE(M_VMPGDATA, "VM pgdata", "XXX: VM pager private data"); +MALLOC_DEFINE(M_VMPGDATA, "vm_pgdata", "XXX: VM pager private data"); int cluster_pbuf_freecnt = -1; /* unlimited to begin with */ |
