From 53fdd8d9388f65b3774be98c05cb8c286a56dac2 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Tue, 15 Jan 2008 00:02:37 +0300 Subject: [PATCH] --- yaml --- r: 75467 b: refs/heads/master c: a98fdcef941e107eeabae622d85a1f476f25a160 h: refs/heads/master i: 75465: 2b53fe35ff1823fdb6035bc2d38a39e57b87c7d3 75463: 7c873779d0e451313e5530ed7eb19a02818990cd v: v3 --- [refs] | 2 +- trunk/fs/proc/array.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34f51e70d8d2..1634a4b1622e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fd3670eb1d3c33e8952cf1e79edbb2d517dcfb5 +refs/heads/master: a98fdcef941e107eeabae622d85a1f476f25a160 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 810eb8fd6500..eb97f2897e2b 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -426,7 +426,6 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) cgtime = gtime = cputime_zero; rcu_read_lock(); - ppid = task_tgid_nr_ns(task->real_parent, ns); if (lock_task_sighand(task, &flags)) { struct signal_struct *sig = task->signal; @@ -465,6 +464,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole) } sid = task_session_nr_ns(task, ns); + ppid = task_tgid_nr_ns(task->real_parent, ns); pgid = task_pgrp_nr_ns(task, ns); unlock_task_sighand(task, &flags);