diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-02-08 04:19:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 09:22:28 -0800 |
| commit | ac9a8e3f0f43d20fc316162e8e5f9186d295ff49 (patch) | |
| tree | a6b8d416c38d222773a46c5d84b3d043facbf008 | |
| parent | 44c4e1b2581f7273ab14ef30b6430618801c57b1 (diff) | |
| download | linux-ac9a8e3f0f43d20fc316162e8e5f9186d295ff49.tar.gz linux-ac9a8e3f0f43d20fc316162e8e5f9186d295ff49.tar.bz2 linux-ac9a8e3f0f43d20fc316162e8e5f9186d295ff49.zip | |
sys_getsid: don't use ->nsproxy directly
With the new semantics of find_vpid() we don't need to play with ->nsproxy
explicitely, _vxx() do the right things.
Also s/tasklist/rcu/.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | kernel/sys.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index ee2e78dbea6c..5a61f8071b8e 100644 --- a/kernel/sys.c +++ b/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; } } |