procfs: kill the global proc_mnt variable

After the previous cleanup in proc_get_sb() the global proc_mnt has no
reasons to exists, kill it.

Signed-off-by: Oleg Nesterov <[email protected]>
Signed-off-by: Eric W. Biederman <[email protected]>
Signed-off-by: Daniel Lezcano <[email protected]>
Cc: Alexey Dobriyan <[email protected]>
Acked-by: Serge E. Hallyn <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index d6a7ca1fdac53dfdf47fb7109207c0ec7597a3e7..d15aa1b1cc8fea9f9a7e702849035095e38f4613 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -46,8 +46,6 @@ static void proc_evict_inode(struct inode *inode)
        }
 }
 
-struct vfsmount *proc_mnt;
-
 static struct kmem_cache * proc_inode_cachep;
 
 static struct inode *proc_alloc_inode(struct super_block *sb)

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 9ad561ded4092a83301db4cd5d6c7f0be37740ce..c03e8d3a3a5b550ef8b88bc60776b48b42795065 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -107,7 +107,6 @@ static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
 }
 void pde_put(struct proc_dir_entry *pde);
 
-extern struct vfsmount *proc_mnt;
 int proc_fill_super(struct super_block *);
 struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
 

diff --git a/fs/proc/root.c b/fs/proc/root.c
index e5e2bfa7a03b7ae380e8ba7968bab862b1f9a0cf..a9000e9cfee54ac804eb71e75d0b72bf989041ed 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -90,19 +90,20 @@ static struct file_system_type proc_fs_type = {
 
 void __init proc_root_init(void)
 {
+       struct vfsmount *mnt;
        int err;
 
        proc_init_inodecache();
        err = register_filesystem(&proc_fs_type);
        if (err)
                return;
-       proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);
-       if (IS_ERR(proc_mnt)) {
+       mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);
+       if (IS_ERR(mnt)) {
                unregister_filesystem(&proc_fs_type);
                return;
        }
 
-       init_pid_ns.proc_mnt = proc_mnt;
+       init_pid_ns.proc_mnt = mnt;
        proc_symlink("mounts", NULL, "self/mounts");
 
        proc_net_init();