aboutsummaryrefslogtreecommitdiffstats
path: root/fs
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 /fs
parent33c429405a2c8d9e42afb9fee88a63cfb2de1e98 (diff)
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 'fs')
-rw-r--r--fs/namespace.c13
-rw-r--r--fs/proc/internal.h5
-rw-r--r--fs/proc/namespaces.c7
3 files changed, 11 insertions, 14 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index f815218f92d3..9dfb4cac0c41 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1570,16 +1570,7 @@ static bool is_mnt_ns_file(struct dentry *dentry)
1570{ 1570{
1571 /* Is this a proxy for a mount namespace? */ 1571 /* Is this a proxy for a mount namespace? */
1572 struct inode *inode = dentry->d_inode; 1572 struct inode *inode = dentry->d_inode;
1573 struct proc_ns *ei; 1573 return proc_ns_inode(inode) && dentry->d_fsdata == &mntns_operations;
1574
1575 if (!proc_ns_inode(inode))
1576 return false;
1577
1578 ei = get_proc_ns(inode);
1579 if (ei->ns_ops != &mntns_operations)
1580 return false;
1581
1582 return true;
1583} 1574}
1584 1575
1585struct mnt_namespace *to_mnt_ns(struct ns_common *ns) 1576struct mnt_namespace *to_mnt_ns(struct ns_common *ns)
@@ -1596,7 +1587,7 @@ static bool mnt_ns_loop(struct dentry *dentry)
1596 if (!is_mnt_ns_file(dentry)) 1587 if (!is_mnt_ns_file(dentry))
1597 return false; 1588 return false;
1598 1589
1599 mnt_ns = to_mnt_ns(get_proc_ns(dentry->d_inode)->ns); 1590 mnt_ns = to_mnt_ns(get_proc_ns(dentry->d_inode));
1600 return current->nsproxy->mnt_ns->seq >= mnt_ns->seq; 1591 return current->nsproxy->mnt_ns->seq >= mnt_ns->seq;
1601} 1592}
1602 1593
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index aa7a0ee182e1..0fabc48d905f 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -57,6 +57,11 @@ union proc_op {
57 struct task_struct *task); 57 struct task_struct *task);
58}; 58};
59 59
60struct proc_ns {
61 struct ns_common *ns;
62 const struct proc_ns_operations *ns_ops;
63};
64
60struct proc_inode { 65struct proc_inode {
61 struct pid *pid; 66 struct pid *pid;
62 int fd; 67 int fd;
diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 995e8e98237d..18fc1cf899de 100644
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -45,7 +45,7 @@ static const struct inode_operations ns_inode_operations = {
45static char *ns_dname(struct dentry *dentry, char *buffer, int buflen) 45static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)
46{ 46{
47 struct inode *inode = dentry->d_inode; 47 struct inode *inode = dentry->d_inode;
48 const struct proc_ns_operations *ns_ops = PROC_I(inode)->ns.ns_ops; 48 const struct proc_ns_operations *ns_ops = dentry->d_fsdata;
49 49
50 return dynamic_dname(dentry, buffer, buflen, "%s:[%lu]", 50 return dynamic_dname(dentry, buffer, buflen, "%s:[%lu]",
51 ns_ops->name, inode->i_ino); 51 ns_ops->name, inode->i_ino);
@@ -75,6 +75,7 @@ static struct dentry *proc_ns_get_dentry(struct super_block *sb,
75 ns_ops->put(ns); 75 ns_ops->put(ns);
76 return ERR_PTR(-ENOMEM); 76 return ERR_PTR(-ENOMEM);
77 } 77 }
78 dentry->d_fsdata = (void *)ns_ops;
78 79
79 inode = iget_locked(sb, ns->inum); 80 inode = iget_locked(sb, ns->inum);
80 if (!inode) { 81 if (!inode) {
@@ -286,9 +287,9 @@ out_invalid:
286 return ERR_PTR(-EINVAL); 287 return ERR_PTR(-EINVAL);
287} 288}
288 289
289struct proc_ns *get_proc_ns(struct inode *inode) 290struct ns_common *get_proc_ns(struct inode *inode)
290{ 291{
291 return &PROC_I(inode)->ns; 292 return PROC_I(inode)->ns.ns;
292} 293}
293 294
294bool proc_ns_inode(struct inode *inode) 295bool proc_ns_inode(struct inode *inode)