diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-02-13 01:35:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-13 01:35:37 -0500 |
commit | 94de7feb2dee6d0039ecbe98ae8b63bbb63808b6 (patch) | |
tree | c0cac64c593efc2e2dc32a7c666bb4e9c4f69bf6 | |
parent | 910d6c320cac65c81d66e8fd30dca167092722eb (diff) |
[NETLABEL]: Compilation for CONFIG_AUDIT=n case.
The audit_log_start() will expand into an empty do { } while (0)
construction and the audit_ctx becomes unused.
The solution: push current->audit_context into audit_log_start()
directly, since it is not required in any other place in the
calling function.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/netlabel/netlabel_user.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c index 85a96a3fddaa..023fc8fe840d 100644 --- a/net/netlabel/netlabel_user.c +++ b/net/netlabel/netlabel_user.c | |||
@@ -96,7 +96,6 @@ int netlbl_netlink_init(void) | |||
96 | struct audit_buffer *netlbl_audit_start_common(int type, | 96 | struct audit_buffer *netlbl_audit_start_common(int type, |
97 | struct netlbl_audit *audit_info) | 97 | struct netlbl_audit *audit_info) |
98 | { | 98 | { |
99 | struct audit_context *audit_ctx = current->audit_context; | ||
100 | struct audit_buffer *audit_buf; | 99 | struct audit_buffer *audit_buf; |
101 | char *secctx; | 100 | char *secctx; |
102 | u32 secctx_len; | 101 | u32 secctx_len; |
@@ -104,7 +103,7 @@ struct audit_buffer *netlbl_audit_start_common(int type, | |||
104 | if (audit_enabled == 0) | 103 | if (audit_enabled == 0) |
105 | return NULL; | 104 | return NULL; |
106 | 105 | ||
107 | audit_buf = audit_log_start(audit_ctx, GFP_ATOMIC, type); | 106 | audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC, type); |
108 | if (audit_buf == NULL) | 107 | if (audit_buf == NULL) |
109 | return NULL; | 108 | return NULL; |
110 | 109 | ||