diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2008-02-08 04:19:20 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:22:29 -0800 |
| commit | 6c5f3e7b43300508fe3947ff3cfff0f86043bb57 (patch) | |
| tree | 9843b8897ec3357b09f62bb6423cd4753e1d4516 /kernel/fork.c | |
| parent | ITIMER_REAL: convert to use struct pid (diff) | |
| download | linux-dev-6c5f3e7b43300508fe3947ff3cfff0f86043bb57.tar.xz linux-dev-6c5f3e7b43300508fe3947ff3cfff0f86043bb57.zip | |
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/fork.c')
| -rw-r--r-- | kernel/fork.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ca54d9704644..31a2bad63a08 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1488,13 +1488,7 @@ long do_fork(unsigned long clone_flags, if (!IS_ERR(p)) { struct completion vfork; - /* - * this is enough to call pid_nr_ns here, but this if - * improves optimisation of regular fork() - */ - nr = (clone_flags & CLONE_NEWPID) ? - task_pid_nr_ns(p, current->nsproxy->pid_ns) : - task_pid_vnr(p); + nr = task_pid_vnr(p); if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); |