diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-01 08:13:17 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-04 20:34:54 +0100 |
| commit | f77c80142e1afe6d5c16975ca5d7d1fc324b16f9 (patch) | |
| tree | c2c8f726402610aee77ccca0627a4c38f944640b /kernel | |
| parent | copy address of proc_ns_ops into ns_common (diff) | |
| download | linux-f77c80142e1afe6d5c16975ca5d7d1fc324b16f9.tar.xz linux-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')
| -rw-r--r-- | kernel/nsproxy.c | 4 |
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; |