audit: we don't need to __set_current_state(TASK_RUNNING)

Remove the calls to __set_current_state() to mark the task as running
and do some related cleanup in wait_for_auditd() to limit the amount
of work we do when we aren't going to reschedule the current task.

Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Paul Moore 2016-04-04 16:44:02 -04:00
parent 0bf676d1fd
commit 7ffb8e317b

View file

@ -430,7 +430,6 @@ restart:
attempts, audit_pid); attempts, audit_pid);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
schedule(); schedule();
__set_current_state(TASK_RUNNING);
goto restart; goto restart;
} }
} }
@ -1324,15 +1323,14 @@ static inline void audit_get_stamp(struct audit_context *ctx,
static long wait_for_auditd(long sleep_time) static long wait_for_auditd(long sleep_time)
{ {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
set_current_state(TASK_UNINTERRUPTIBLE);
add_wait_queue_exclusive(&audit_backlog_wait, &wait);
if (audit_backlog_limit && if (audit_backlog_limit &&
skb_queue_len(&audit_skb_queue) > audit_backlog_limit) skb_queue_len(&audit_skb_queue) > audit_backlog_limit) {
add_wait_queue_exclusive(&audit_backlog_wait, &wait);
set_current_state(TASK_UNINTERRUPTIBLE);
sleep_time = schedule_timeout(sleep_time); sleep_time = schedule_timeout(sleep_time);
remove_wait_queue(&audit_backlog_wait, &wait);
__set_current_state(TASK_RUNNING); }
remove_wait_queue(&audit_backlog_wait, &wait);
return sleep_time; return sleep_time;
} }