From 86bcebee3a0bb3d0394296c4af7d291e41c39b90 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 8 Feb 2008 04:19:15 -0800 Subject: [PATCH] --- yaml --- r: 84668 b: refs/heads/master c: ac9a8e3f0f43d20fc316162e8e5f9186d295ff49 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sys.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 21f5f4010a41..9090fca69eca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44c4e1b2581f7273ab14ef30b6430618801c57b1 +refs/heads/master: ac9a8e3f0f43d20fc316162e8e5f9186d295ff49 diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c index ee2e78dbea6c..5a61f8071b8e 100644 --- a/trunk/kernel/sys.c +++ b/trunk/kernel/sys.c @@ -1025,19 +1025,16 @@ asmlinkage long sys_getsid(pid_t pid) else { int retval; struct task_struct *p; - struct pid_namespace *ns; - - ns = current->nsproxy->pid_ns; - read_lock(&tasklist_lock); - p = find_task_by_pid_ns(pid, ns); + rcu_read_lock(); + p = find_task_by_vpid(pid); retval = -ESRCH; if (p) { retval = security_task_getsid(p); if (!retval) - retval = task_session_nr_ns(p, ns); + retval = task_session_vnr(p); } - read_unlock(&tasklist_lock); + rcu_read_unlock(); return retval; } }