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.
This commit is contained in:
parent
9dc2f0df89
commit
5bb84bc84b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=151897
@ -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);
|
||||
|
@ -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..
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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),
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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, "");
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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 *);
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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");
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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");
|
||||
|
||||
/* -------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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..
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <vm/uma.h>
|
||||
|
||||
static MALLOC_DEFINE(M_FILEDESC, "filedesc", "Open file descriptor table");
|
||||
static MALLOC_DEFINE(M_FILEDESC_TO_LEADER, "file desc to leader",
|
||||
static MALLOC_DEFINE(M_FILEDESC_TO_LEADER, "filedesc_to_leader",
|
||||
"file desc to leader structures");
|
||||
static MALLOC_DEFINE(M_SIGIO, "sigio", "sigio structures");
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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);
|
||||
/*
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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 *,
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -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 *);
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
||||
|
@ -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");
|
||||
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
|
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user