From e2c5adc88a0ffd4a715f630c3b83a1d5cbfd1cff Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 8 Apr 2013 14:43:41 -0700 Subject: 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 Cc: Eric Paris Cc: Rakib Mullick Signed-off-by: Andrew Morton Signed-off-by: Eric Paris --- kernel/auditsc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'kernel/auditsc.c') 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; -- cgit v1.2.3-18-g5258