summaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-11-01 03:13:17 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-12-04 14:34:54 -0500
commitf77c80142e1afe6d5c16975ca5d7d1fc324b16f9 (patch)
treec2c8f726402610aee77ccca0627a4c38f944640b /kernel/nsproxy.c
parent33c429405a2c8d9e42afb9fee88a63cfb2de1e98 (diff)
downloadlinux-stable-f77c80142e1afe6d5c16975ca5d7d1fc324b16f9.tar.gz
linux-stable-f77c80142e1afe6d5c16975ca5d7d1fc324b16f9.tar.bz2
linux-stable-f77c80142e1afe6d5c16975ca5d7d1fc324b16f9.zip
bury struct proc_ns in fs/proc
a) make get_proc_ns() return a pointer to struct ns_common b) mirror ns_ops in dentry->d_fsdata of ns dentries, so that is_mnt_ns_file() could get away with fewer dereferences. That way struct proc_ns becomes invisible outside of fs/proc/*.c Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 87c37221cb7f..49746c81ad8d 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -222,7 +222,6 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype)
{
struct task_struct *tsk = current;
struct nsproxy *new_nsproxy;
- struct proc_ns *ei;
struct file *file;
struct ns_common *ns;
int err;
@@ -232,8 +231,7 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype)
return PTR_ERR(file);
err = -EINVAL;
- ei = get_proc_ns(file_inode(file));
- ns = ei->ns;
+ ns = get_proc_ns(file_inode(file));
if (nstype && (ns->ops->type != nstype))
goto out;