Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 09f0d9c374a32dd79d1fc10f5087510915db8a97..6ed95802239dfdf33ce576c21be00668dafdc893 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -168,16 +168,16 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
        int g;
        struct fdtable *fdt = NULL;
        const struct cred *cred;
-       pid_t ppid, tpid;
+       pid_t ppid = 0, tpid = 0;
+       struct task_struct *leader = NULL;
 
        rcu_read_lock();
-       ppid = pid_alive(p) ?
-               task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0;
-       tpid = 0;
        if (pid_alive(p)) {
                struct task_struct *tracer = ptrace_parent(p);
                if (tracer)
                        tpid = task_pid_nr_ns(tracer, ns);
+               ppid = task_tgid_nr_ns(rcu_dereference(p->real_parent), ns);
+               leader = p->group_leader;
        }
        cred = get_task_cred(p);
        seq_printf(m,
@@ -189,7 +189,7 @@ static inline void task_state(struct seq_file *m, struct pid_namespace *ns,
                "Uid:\t%d\t%d\t%d\t%d\n"
                "Gid:\t%d\t%d\t%d\t%d\n",
                get_task_state(p),
-               task_tgid_nr_ns(p, ns),
+               leader ? task_pid_nr_ns(leader, ns) : 0,
                pid_nr_ns(pid, ns),
                ppid, tpid,
                from_kuid_munged(user_ns, cred->uid),