提交 56179a6e 编写于 作者: E Eric Paris 提交者: Al Viro

audit: drop some potentially inadvisable likely notations

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: NEric Paris <eparis@redhat.com>
上级 997f5b64
......@@ -805,7 +805,7 @@ static inline struct audit_context *audit_get_context(struct task_struct *tsk,
{
struct audit_context *context = tsk->audit_context;
if (likely(!context))
if (!context)
return NULL;
context->return_valid = return_valid;
......@@ -928,7 +928,7 @@ int audit_alloc(struct task_struct *tsk)
return 0; /* Return if not auditing. */
state = audit_filter_task(tsk, &key);
if (likely(state == AUDIT_DISABLED))
if (state == AUDIT_DISABLED)
return 0;
if (!(context = audit_alloc_context(state))) {
......@@ -1599,7 +1599,7 @@ void audit_free(struct task_struct *tsk)
struct audit_context *context;
context = audit_get_context(tsk, 0, 0);
if (likely(!context))
if (!context)
return;
/* 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;
enum audit_state state;
if (unlikely(!context))
if (!context)
return;
/*
......@@ -1697,7 +1697,7 @@ void __audit_syscall_entry(int arch, int major,
context->prio = 0;
state = audit_filter_syscall(tsk, context, &audit_filter_list[AUDIT_FILTER_ENTRY]);
}
if (likely(state == AUDIT_DISABLED))
if (state == AUDIT_DISABLED)
return;
context->serial = 0;
......@@ -1748,7 +1748,7 @@ void __audit_syscall_exit(int success, long return_code)
success = AUDITSC_FAILURE;
context = audit_get_context(tsk, success, return_code);
if (likely(!context))
if (!context)
return;
if (context->in_syscall && context->current_state == AUDIT_RECORD_CONTEXT)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册