1 files changed, 7 insertions, 13 deletions

diff --git a/kernel/kthread.c b/kernel/kthread.c
index a84dee265f94..9b12d65186f7 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -324,12 +324,6 @@ struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),
         return p;
 }
 
-static struct kthread *task_get_live_kthread(struct task_struct *k)
-{
-        get_task_struct(k);
-        return to_live_kthread(k);
-}
-
 static void __kthread_unpark(struct task_struct *k, struct kthread *kthread)
 {
         clear_bit(KTHREAD_SHOULD_PARK, &kthread->flags);
@@ -356,11 +350,10 @@ static void __kthread_unpark(struct task_struct *k, struct kthread *kthread)
  */
 void kthread_unpark(struct task_struct *k)
 {
-        struct kthread *kthread = task_get_live_kthread(k);
+        struct kthread *kthread = to_live_kthread(k);
 
         if (kthread)
                 __kthread_unpark(k, kthread);
-        put_task_struct(k);
 }
 
 /**
@@ -377,7 +370,7 @@ void kthread_unpark(struct task_struct *k)
  */
 int kthread_park(struct task_struct *k)
 {
-        struct kthread *kthread = task_get_live_kthread(k);
+        struct kthread *kthread = to_live_kthread(k);
         int ret = -ENOSYS;
 
         if (kthread) {
@@ -390,7 +383,6 @@ int kthread_park(struct task_struct *k)
                 }
                 ret = 0;
         }
-        put_task_struct(k);
         return ret;
 }
 
@@ -411,10 +403,13 @@ int kthread_park(struct task_struct *k)
  */
 int kthread_stop(struct task_struct *k)
 {
-        struct kthread *kthread = task_get_live_kthread(k);
+        struct kthread *kthread;
         int ret;
 
         trace_sched_kthread_stop(k);
+
+        get_task_struct(k);
+        kthread = to_live_kthread(k);
         if (kthread) {
                 set_bit(KTHREAD_SHOULD_STOP, &kthread->flags);
                 __kthread_unpark(k, kthread);
@@ -422,10 +417,9 @@ int kthread_stop(struct task_struct *k)
                 wait_for_completion(&kthread->exited);
         }
         ret = k->exit_code;
-
         put_task_struct(k);
-        trace_sched_kthread_stop_ret(ret);
 
+        trace_sched_kthread_stop_ret(ret);
         return ret;
 }
 EXPORT_SYMBOL(kthread_stop);