From 7db4b7b9950b54bdfaf270036fdade986bfa705d Mon Sep 17 00:00:00 2001
From: Thomas Liu <tliu@redhat.com>
Date: Thu, 9 Jul 2009 10:00:30 -0400
Subject: [PATCH] --- yaml --- r: 157306 b: refs/heads/master c:
 d4131ded4d4c1a5c1363ddd93ca104ed97dd0458 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/include/linux/lsm_audit.h     |  2 +-
 trunk/security/smack/smack.h        |  2 +-
 trunk/security/smack/smack_access.c | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7b2c01839f88..2cab16a4cfed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed5215a21460f63d6bdc118cb55a9e6d1b433f35
+refs/heads/master: d4131ded4d4c1a5c1363ddd93ca104ed97dd0458
diff --git a/trunk/include/linux/lsm_audit.h b/trunk/include/linux/lsm_audit.h
index 68f7bce572b0..40d1b84f2a3c 100644
--- a/trunk/include/linux/lsm_audit.h
+++ b/trunk/include/linux/lsm_audit.h
@@ -86,7 +86,7 @@ struct common_audit_data {
 			struct av_decision *avd;
 			int result;
 		} selinux_audit_data;
-	} lsm_priv;
+	};
 	/* these callback will be implemented by a specific LSM */
 	void (*lsm_pre_audit)(struct audit_buffer *, void *);
 	void (*lsm_post_audit)(struct audit_buffer *, void *);
diff --git a/trunk/security/smack/smack.h b/trunk/security/smack/smack.h
index ff180ede3e47..c6e9acae72e4 100644
--- a/trunk/security/smack/smack.h
+++ b/trunk/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.lsm_priv.smack_audit_data.function = func;
+	a->a.smack_audit_data.function = func;
 }
 
 static inline void smk_ad_setfield_u_tsk(struct smk_audit_info *a,
diff --git a/trunk/security/smack/smack_access.c b/trunk/security/smack/smack_access.c
index dd84877dff30..0f9ac8146900 100644
--- a/trunk/security/smack/smack_access.c
+++ b/trunk/security/smack/smack_access.c
@@ -240,9 +240,9 @@ static inline void smack_str_from_perm(char *string, int access)
 static void smack_log_callback(struct audit_buffer *ab, void *a)
 {
 	struct common_audit_data *ad = a;
-	struct smack_audit_data *sad = &ad->lsm_priv.smack_audit_data;
+	struct smack_audit_data *sad = &ad->smack_audit_data;
 	audit_log_format(ab, "lsm=SMACK fn=%s action=%s",
-			 ad->lsm_priv.smack_audit_data.function,
+			 ad->smack_audit_data.function,
 			 sad->result ? "denied" : "granted");
 	audit_log_format(ab, " subject=");
 	audit_log_untrustedstring(ab, sad->subject);
@@ -275,11 +275,11 @@ void smack_log(char *subject_label, char *object_label, int request,
 	if (result == 0 && (log_policy & SMACK_AUDIT_ACCEPT) == 0)
 		return;
 
-	if (a->lsm_priv.smack_audit_data.function == NULL)
-		a->lsm_priv.smack_audit_data.function = "unknown";
+	if (a->smack_audit_data.function == NULL)
+		a->smack_audit_data.function = "unknown";
 
 	/* end preparing the audit data */
-	sad = &a->lsm_priv.smack_audit_data;
+	sad = &a->smack_audit_data;
 	smack_str_from_perm(request_buffer, request);
 	sad->subject = subject_label;
 	sad->object  = object_label;