aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-02-08 07:19:20 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:29 -0500
commit6c5f3e7b43300508fe3947ff3cfff0f86043bb57 (patch)
tree9843b8897ec3357b09f62bb6423cd4753e1d4516 /kernel/sys.c
parentfea9d175545b38cb3e84569400419eb81bc90fa3 (diff)
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/sys.c')
-rw-r--r--kernel/sys.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index 5a61f8071b8e..a626116af5db 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -991,17 +991,14 @@ asmlinkage long sys_getpgid(pid_t pid)
991 else { 991 else {
992 int retval; 992 int retval;
993 struct task_struct *p; 993 struct task_struct *p;
994 struct pid_namespace *ns;
995
996 ns = current->nsproxy->pid_ns;
997 994
998 read_lock(&tasklist_lock); 995 read_lock(&tasklist_lock);
999 p = find_task_by_pid_ns(pid, ns); 996 p = find_task_by_vpid(pid);
1000 retval = -ESRCH; 997 retval = -ESRCH;
1001 if (p) { 998 if (p) {
1002 retval = security_task_getpgid(p); 999 retval = security_task_getpgid(p);
1003 if (!retval) 1000 if (!retval)
1004 retval = task_pgrp_nr_ns(p, ns); 1001 retval = task_pgrp_vnr(p);
1005 } 1002 }
1006 read_unlock(&tasklist_lock); 1003 read_unlock(&tasklist_lock);
1007 return retval; 1004 return retval;