[NETLABEL]: Compilation for CONFIG_AUDIT=n case.
authorPavel Emelyanov <xemul@openvz.org>
Wed, 13 Feb 2008 06:35:37 +0000 (22:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Feb 2008 06:35:37 +0000 (22:35 -0800)
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>
net/netlabel/netlabel_user.c

index 85a96a3fddaafdaa016dbdd14aea0f9433d8c22e..023fc8fe840d16169f2cb90dd1a494122f460434 100644 (file)
@@ -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;