aboutsummaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c13
1 files changed, 2 insertions, 11 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