1 files changed, 7 insertions, 7 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5ee46d3a5cac..43871c85729d 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2267,15 +2267,15 @@ out:
  */
 static struct task_struct *next_tid(struct task_struct *start)
 {
-        struct task_struct *pos;
+        struct task_struct *pos = NULL;
         rcu_read_lock();
-        pos = start;
-        if (pid_alive(start))
+        if (pid_alive(start)) {
                 pos = next_thread(start);
-        if (pid_alive(pos) && (pos != start->group_leader))
-                get_task_struct(pos);
-        else
-                pos = NULL;
+                if (thread_group_leader(pos))
+                        pos = NULL;
+                else
+                        get_task_struct(pos);
+        }
         rcu_read_unlock();
         put_task_struct(start);
         return pos;