summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2006-11-29 16:50:27 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:31:39 -0800
commit6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8 (patch)
treeca4c974f9eedc3ab756b6eecb7c2db2a68095493 /security
parent484b366932be0b73a22c74a82748ca10a721643e (diff)
downloadlinux-3.10-6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8.tar.gz
linux-3.10-6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8.tar.bz2
linux-3.10-6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8.zip
Rename class_destroy to avoid namespace conflicts.
We're seeing increasing namespace conflicts between the global class_destroy() function declared in linux/device.h, and the private function in the SELinux core code. This patch renames the SELinux function to cls_destroy() to avoid this conflict. Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/ss/policydb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index ba48961f9d0..cd79c6338aa 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -468,7 +468,7 @@ static int common_destroy(void *key, void *datum, void *p)
return 0;
}
-static int class_destroy(void *key, void *datum, void *p)
+static int cls_destroy(void *key, void *datum, void *p)
{
struct class_datum *cladatum;
struct constraint_node *constraint, *ctemp;
@@ -566,7 +566,7 @@ static int cat_destroy(void *key, void *datum, void *p)
static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) =
{
common_destroy,
- class_destroy,
+ cls_destroy,
role_destroy,
type_destroy,
user_destroy,
@@ -1124,7 +1124,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp)
out:
return rc;
bad:
- class_destroy(key, cladatum, NULL);
+ cls_destroy(key, cladatum, NULL);
goto out;
}