diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-02-08 15:19:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 20:22:29 +0300 |
| commit | 6c5f3e7b43300508fe3947ff3cfff0f86043bb57 (patch) | |
| tree | 9843b8897ec3357b09f62bb6423cd4753e1d4516 /kernel/exit.c | |
| parent | fea9d175545b38cb3e84569400419eb81bc90fa3 (diff) | |
| download | linux-6c5f3e7b43300508fe3947ff3cfff0f86043bb57.tar.xz | |
Pidns: make full use of xxx_vnr() calls
Some time ago the xxx_vnr() calls (e.g. pid_vnr or find_task_by_vpid) were
_all_ converted to operate on the current pid namespace. After this each call
like xxx_nr_ns(foo, current->nsproxy->pid_ns) is nothing but a xxx_vnr(foo)
one.
Switch all the xxx_nr_ns() callers to use the xxx_vnr() calls where
appropriate.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Reviewed-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 2567de3487bd..81345ba4b253 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1174,7 +1174,7 @@ static int wait_task_zombie(struct task_struct *p, int noreap, { unsigned long state; int retval, status, traced; - pid_t pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); + pid_t pid = task_pid_vnr(p); if (unlikely(noreap)) { uid_t uid = p->uid; @@ -1369,7 +1369,7 @@ unlock_sig: * possibly take page faults for user memory. */ get_task_struct(p); - pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); + pid = task_pid_vnr(p); why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; read_unlock(&tasklist_lock); @@ -1428,7 +1428,7 @@ static int wait_task_continued(struct task_struct *p, int noreap, p->signal->flags &= ~SIGNAL_STOP_CONTINUED; spin_unlock_irq(&p->sighand->siglock); - pid = task_pid_nr_ns(p, current->nsproxy->pid_ns); + pid = task_pid_vnr(p); uid = p->uid; get_task_struct(p); read_unlock(&tasklist_lock); |