bury struct proc_ns in fs/proc

[mirror_ubuntu-artful-kernel.git] / kernel / nsproxy.c

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 87c37221cb7f66a6b7e1e082821a8857479177e6..49746c81ad8d28abb3ac85ad82ee9dbc4ce69e81 100644 (file)
--- 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;