summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-12 22:35:37 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-12 22:35:37 -0800
commit94de7feb2dee6d0039ecbe98ae8b63bbb63808b6 (patch)
treec0cac64c593efc2e2dc32a7c666bb4e9c4f69bf6
parent910d6c320cac65c81d66e8fd30dca167092722eb (diff)
downloadblackbird-op-linux-94de7feb2dee6d0039ecbe98ae8b63bbb63808b6.tar.gz
blackbird-op-linux-94de7feb2dee6d0039ecbe98ae8b63bbb63808b6.zip
[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.c3
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)
struct audit_buffer *netlbl_audit_start_common(int type,
struct netlbl_audit *audit_info)
{
- struct audit_context *audit_ctx = current->audit_context;
struct audit_buffer *audit_buf;
char *secctx;
u32 secctx_len;
@@ -104,7 +103,7 @@ struct audit_buffer *netlbl_audit_start_common(int type,
if (audit_enabled == 0)
return NULL;
- audit_buf = audit_log_start(audit_ctx, GFP_ATOMIC, type);
+ audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC, type);
if (audit_buf == NULL)
return NULL;
OpenPOWER on IntegriCloud