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>
This commit is contained in:
Andrew Morton 2013-04-08 14:43:41 -07:00 committed by Eric Paris
parent 17c6ee707a
commit e2c5adc88a
1 changed files with 2 additions and 8 deletions

View File

@ -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;