kill proc_ns completely

[firefly-linux-kernel-4.4.55.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 333080d7a6717ad2a9ac78b3a9215553d435b2f1..8420a2f80811821c046b7ce069416dd291ea6349 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -32,8 +32,6 @@ static void proc_evict_inode(struct inode *inode)
 {
        struct proc_dir_entry *de;
        struct ctl_table_header *head;
-       const struct proc_ns_operations *ns_ops;
-       void *ns;
 
        truncate_inode_pages_final(&inode->i_data);
        clear_inode(inode);
@@ -50,11 +48,6 @@ static void proc_evict_inode(struct inode *inode)
                RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
                sysctl_head_put(head);
        }
-       /* Release any associated namespace */
-       ns_ops = PROC_I(inode)->ns.ns_ops;
-       ns = PROC_I(inode)->ns.ns;
-       if (ns_ops && ns)
-               ns_ops->put(ns);
 }
 
 static struct kmem_cache * proc_inode_cachep;
@@ -73,8 +66,7 @@ static struct inode *proc_alloc_inode(struct super_block *sb)
        ei->pde = NULL;
        ei->sysctl = NULL;
        ei->sysctl_entry = NULL;
-       ei->ns.ns = NULL;
-       ei->ns.ns_ops = NULL;
+       ei->ns_ops = NULL;
        inode = &ei->vfs_inode;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        return inode;