renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-11 23:03:55 +08:00
Code

audit: drop some potentially inadvisable likely notations

Browse Source 
The audit code makes heavy use of likely() and unlikely() macros, but they
don't always make sense.  Drop any that seem questionable and let the
computer do it's thing.

Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Eric Paris 2012-01-03 14:23:06 -05:00 committed by Al Viro
parent 997f5b6444
commit 56179a6ec6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/auditsc.c
View File

@ -805,7 +805,7 @@ static inline struct audit_context *audit_get_context(struct task_struct *tsk,
{ {
struct audit_context *context = tsk->audit_context; struct audit_context *context = tsk->audit_context;
if (likely(!context)) if (!context)
return NULL; return NULL;
context->return_valid = return_valid; context->return_valid = return_valid;
@ -928,7 +928,7 @@ int audit_alloc(struct task_struct *tsk)
return 0; /* Return if not auditing. */ return 0; /* Return if not auditing. */
state = audit_filter_task(tsk, &key); state = audit_filter_task(tsk, &key);
if (likely(state == AUDIT_DISABLED)) if (state == AUDIT_DISABLED)
return 0; return 0;
if (!(context = audit_alloc_context(state))) { if (!(context = audit_alloc_context(state))) {
@ -1599,7 +1599,7 @@ void audit_free(struct task_struct *tsk)
struct audit_context *context; struct audit_context *context;
context = audit_get_context(tsk, 0, 0); context = audit_get_context(tsk, 0, 0);
if (likely(!context)) if (!context)
return; return;
/* Check for system calls that do not go through the exit /* Check for system calls that do not go through the exit
@ -1640,7 +1640,7 @@ void __audit_syscall_entry(int arch, int major,
struct audit_context *context = tsk->audit_context; struct audit_context *context = tsk->audit_context;
enum audit_state state; enum audit_state state;
if (unlikely(!context)) if (!context)
return; return;
/* /*
@ -1697,7 +1697,7 @@ void __audit_syscall_entry(int arch, int major,
context->prio = 0; context->prio = 0;
state = audit_filter_syscall(tsk, context, &audit_filter_list[AUDIT_FILTER_ENTRY]); state = audit_filter_syscall(tsk, context, &audit_filter_list[AUDIT_FILTER_ENTRY]);
} }
if (likely(state == AUDIT_DISABLED)) if (state == AUDIT_DISABLED)
return; return;
context->serial = 0; context->serial = 0;
@ -1748,7 +1748,7 @@ void __audit_syscall_exit(int success, long return_code)
success = AUDITSC_FAILURE; success = AUDITSC_FAILURE;
context = audit_get_context(tsk, success, return_code); context = audit_get_context(tsk, success, return_code);
if (likely(!context)) if (!context)
return; return;
if (context->in_syscall && context->current_state == AUDIT_RECORD_CONTEXT) if (context->in_syscall && context->current_state == AUDIT_RECORD_CONTEXT)