From 76de2aef7f0dbd836bfe58081226e43d7c4766ee Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Wed, 28 Nov 2007 16:21:24 -0800 Subject: [PATCH] --- yaml --- r: 74350 b: refs/heads/master c: c895078355b6b6e05c60aa205892526dd3390f0a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/exit.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0ed6005e7cf1..3280ae503e08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2319540cd7330fa9066e5b9b84d357a2c8631a2 +refs/heads/master: c895078355b6b6e05c60aa205892526dd3390f0a diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index cd0f1d4137a7..0a4a382ecf23 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -1357,7 +1357,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, int __user *stat_addr, struct rusage __user *ru) { int retval, exit_code; - struct pid_namespace *ns; + pid_t pid; if (!p->exit_code) return 0; @@ -1376,12 +1376,11 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, * keep holding onto the tasklist_lock while we call getrusage and * possibly take page faults for user memory. */ - ns = current->nsproxy->pid_ns; + pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); get_task_struct(p); read_unlock(&tasklist_lock); if (unlikely(noreap)) { - pid_t pid = task_pid_nr_ns(p, ns); uid_t uid = p->uid; int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; @@ -1451,11 +1450,11 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, if (!retval && infop) retval = put_user(exit_code, &infop->si_status); if (!retval && infop) - retval = put_user(task_pid_nr_ns(p, ns), &infop->si_pid); + retval = put_user(pid, &infop->si_pid); if (!retval && infop) retval = put_user(p->uid, &infop->si_uid); if (!retval) - retval = task_pid_nr_ns(p, ns); + retval = pid; put_task_struct(p); BUG_ON(!retval);