1 files changed, 3 insertions, 6 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index cf13c44f3da3..083bf8953ce8 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1249,14 +1249,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
                         __ptrace_link(p, current->parent);
 
                 if (thread_group_leader(p)) {
-                        pid_t pgid = process_group(current);
-                        pid_t sid = process_session(current);
-
                         p->signal->tty = current->signal->tty;
-                        p->signal->pgrp = pgid;
+                        p->signal->pgrp = process_group(current);
                         set_signal_session(p->signal, process_session(current));
-                        attach_pid(p, PIDTYPE_PGID, find_pid(pgid));
-                        attach_pid(p, PIDTYPE_SID, find_pid(sid));
+                        attach_pid(p, PIDTYPE_PGID, task_pgrp(current));
+                        attach_pid(p, PIDTYPE_SID, task_session(current));
 
                         list_add_tail_rcu(&p->tasks, &init_task.tasks);
                         __get_cpu_var(process_counts)++;