summaryrefslogtreecommitdiffstats
path: root/security/smack/smack.h
diff options
context:
space:
mode:
authorThomas Liu <tliu@redhat.com>2009-07-09 16:00:29 +0200
committerJames Morris <jmorris@namei.org>2009-07-10 00:54:14 +0200
commited5215a21460f63d6bdc118cb55a9e6d1b433f35 (patch)
tree8134723eb6a5d73162a7e5d9c11ac66440f11b82 /security/smack/smack.h
parentMerge branch 'master' into next (diff)
downloadlinux-ed5215a21460f63d6bdc118cb55a9e6d1b433f35.tar.xz
linux-ed5215a21460f63d6bdc118cb55a9e6d1b433f35.zip
Move variable function in lsm_audit.h into SMACK private space
Moved variable function in include/linux/lsm_audit.h into the smack_audit_data struct since it is never used outside of it. Also removed setting of function in the COMMON_AUDIT_DATA_INIT macro because that variable is now private to SMACK. Signed-off-by: Thomas Liu <tliu@redhat.com> Acked-by: Eric Paris <eparis@redhat.com> I-dont-see-any-problems-with-it: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/smack/smack.h')
-rw-r--r--security/smack/smack.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h
index 243bec175be0..ff180ede3e47 100644
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -275,7 +275,7 @@ static inline void smk_ad_init(struct smk_audit_info *a, const char *func,
{
memset(a, 0, sizeof(*a));
a->a.type = type;
- a->a.function = func;
+ a->a.lsm_priv.smack_audit_data.function = func;
}
static inline void smk_ad_setfield_u_tsk(struct smk_audit_info *a,