diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2016-03-31 10:49:28 +0200 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2016-04-04 09:46:47 -0400 |
| commit | 0bf676d1fd5144e66ac06939fa3c7c12086c3b18 (patch) | |
| tree | 2f47c4a3192ba0e63ac5133247c94abca94c1cfd /kernel/audit_tree.c | |
| parent | b562e44f507e863c6792946e4e1b1449fbbac85d (diff) | |
| download | linux-stable-0bf676d1fd5144e66ac06939fa3c7c12086c3b18.tar.gz linux-stable-0bf676d1fd5144e66ac06939fa3c7c12086c3b18.tar.bz2 linux-stable-0bf676d1fd5144e66ac06939fa3c7c12086c3b18.zip | |
audit: cleanup prune_tree_thread
We can use kthread_run instead of kthread_create+wake_up_process for
creating the thread.
We do not need to set the task state to TASK_RUNNING after schedule(),
the process is in that state already.
And we do not need to set the state to TASK_INTERRUPTIBLE when not
doing schedule() as we set the state to TASK_RUNNING immediately
afterwards.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Paul Moore <paul@paul-moore.com>
Cc: Eric Paris <eparis@redhat.com>
Cc: <linux-audit@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'kernel/audit_tree.c')
| -rw-r--r-- | kernel/audit_tree.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index 5efe9b299a12..25772476fa4a 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -661,10 +661,10 @@ static int tag_mount(struct vfsmount *mnt, void *arg) static int prune_tree_thread(void *unused) { for (;;) { - set_current_state(TASK_INTERRUPTIBLE); - if (list_empty(&prune_list)) + if (list_empty(&prune_list)) { + set_current_state(TASK_INTERRUPTIBLE); schedule(); - __set_current_state(TASK_RUNNING); + } mutex_lock(&audit_cmd_mutex); mutex_lock(&audit_filter_mutex); @@ -693,16 +693,14 @@ static int audit_launch_prune(void) { if (prune_thread) return 0; - prune_thread = kthread_create(prune_tree_thread, NULL, + prune_thread = kthread_run(prune_tree_thread, NULL, "audit_prune_tree"); if (IS_ERR(prune_thread)) { pr_err("cannot start thread audit_prune_tree"); prune_thread = NULL; return -ENOMEM; - } else { - wake_up_process(prune_thread); - return 0; } + return 0; } /* called with audit_filter_mutex */ |