Commit 52e9fc76 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds

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: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@free.fr>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarSerge E. Hallyn <serge@hallyn.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4308eebb
...@@ -46,8 +46,6 @@ static void proc_evict_inode(struct inode *inode) ...@@ -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 kmem_cache * proc_inode_cachep;
static struct inode *proc_alloc_inode(struct super_block *sb) static struct inode *proc_alloc_inode(struct super_block *sb)
......
...@@ -107,7 +107,6 @@ static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde) ...@@ -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); void pde_put(struct proc_dir_entry *pde);
extern struct vfsmount *proc_mnt;
int proc_fill_super(struct super_block *); int proc_fill_super(struct super_block *);
struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *); struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
......
...@@ -90,19 +90,20 @@ static struct file_system_type proc_fs_type = { ...@@ -90,19 +90,20 @@ static struct file_system_type proc_fs_type = {
void __init proc_root_init(void) void __init proc_root_init(void)
{ {
struct vfsmount *mnt;
int err; int err;
proc_init_inodecache(); proc_init_inodecache();
err = register_filesystem(&proc_fs_type); err = register_filesystem(&proc_fs_type);
if (err) if (err)
return; return;
proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);
if (IS_ERR(proc_mnt)) { if (IS_ERR(mnt)) {
unregister_filesystem(&proc_fs_type); unregister_filesystem(&proc_fs_type);
return; return;
} }
init_pid_ns.proc_mnt = proc_mnt; init_pid_ns.proc_mnt = mnt;
proc_symlink("mounts", NULL, "self/mounts"); proc_symlink("mounts", NULL, "self/mounts");
proc_net_init(); proc_net_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment