From 2d43d24ed44e21ea448e8f1587a17c1732cf682e Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Mon, 11 Nov 2002 14:15:58 +0000 Subject: [PATCH] Garbage collect definition of M_MACOPVEC -- we no longer perform a dynamic mapping of an operation vector into an operation structure, rather, we rely on C99 sparse structure initialization. Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories --- sys/kern/kern_mac.c | 2 -- sys/security/mac/mac_framework.c | 2 -- sys/security/mac/mac_internal.h | 2 -- sys/security/mac/mac_net.c | 2 -- sys/security/mac/mac_pipe.c | 2 -- sys/security/mac/mac_process.c | 2 -- sys/security/mac/mac_syscalls.c | 2 -- sys/security/mac/mac_system.c | 2 -- sys/security/mac/mac_vfs.c | 2 -- 9 files changed, 18 deletions(-) diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index 69fa5ad73bc..e5fb6ef1dec 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -219,8 +219,6 @@ static void mac_destroy_socket_label(struct label *label); static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); - -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage");