aboutsummaryrefslogtreecommitdiff
path: root/kernel/auditsc.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-04-08 14:43:41 -0700
committerEric Paris <eparis@redhat.com>2013-04-10 15:18:50 -0400
commite2c5adc88a0ffd4a715f630c3b83a1d5cbfd1cff (patch)
tree8672edc36d96ec1328e7596882bf666f23fa03d5 /kernel/auditsc.c
parent17c6ee707a32c8e67861a442f387def5b7f64cec (diff)
downloadlinaro-lsk-e2c5adc88a0ffd4a715f630c3b83a1d5cbfd1cff.tar.gz
auditsc: remove audit_set_context() altogether - fold it into its caller
> In function audit_alloc_context(), use kzalloc, instead of kmalloc+memset. Patch also renames audit_zero_context() to > audit_set_context(), to represent it's inner workings properly. Fair enough. I'd go futher... Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Eric Paris <eparis@redhat.com> Cc: Rakib Mullick <rakib.mullick@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r--kernel/auditsc.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 9dc3bae9793..b536d22fe56 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1048,13 +1048,6 @@ static inline void audit_free_aux(struct audit_context *context)
}
}
-static inline void audit_set_context(struct audit_context *context,
- enum audit_state state)
-{
- context->state = state;
- context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
-}
-
static inline struct audit_context *audit_alloc_context(enum audit_state state)
{
struct audit_context *context;
@@ -1062,7 +1055,8 @@ static inline struct audit_context *audit_alloc_context(enum audit_state state)
context = kzalloc(sizeof(*context), GFP_KERNEL);
if (!context)
return NULL;
- audit_set_context(context, state);
+ context->state = state;
+ context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
INIT_LIST_HEAD(&context->killed_trees);
INIT_LIST_HEAD(&context->names_list);
return context;