Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 52e9fc76d0d4b1e8adeee736172c6c23180059b2

Authored by Oleg Nesterov
Committed by Linus Torvalds
1 parent 4308eebbeb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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 <oleg@redhat.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Serge E. Hallyn <serge@hallyn.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 4 additions and 6 deletions Side-by-side Diff

... ... @@ -46,8 +46,6 @@
46 46 }
47 47 }
48 48  
49   -struct vfsmount *proc_mnt;
50   -
51 49 static struct kmem_cache * proc_inode_cachep;
52 50  
53 51 static struct inode *proc_alloc_inode(struct super_block *sb)
... ... @@ -107,7 +107,6 @@
107 107 }
108 108 void pde_put(struct proc_dir_entry *pde);
109 109  
110   -extern struct vfsmount *proc_mnt;
111 110 int proc_fill_super(struct super_block *);
112 111 struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *);
113 112  
... ... @@ -90,19 +90,20 @@
90 90  
91 91 void __init proc_root_init(void)
92 92 {
  93 + struct vfsmount *mnt;
93 94 int err;
94 95  
95 96 proc_init_inodecache();
96 97 err = register_filesystem(&proc_fs_type);
97 98 if (err)
98 99 return;
99   - proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);
100   - if (IS_ERR(proc_mnt)) {
  100 + mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);
  101 + if (IS_ERR(mnt)) {
101 102 unregister_filesystem(&proc_fs_type);
102 103 return;
103 104 }
104 105  
105   - init_pid_ns.proc_mnt = proc_mnt;
  106 + init_pid_ns.proc_mnt = mnt;
106 107 proc_symlink("mounts", NULL, "self/mounts");
107 108  
108 109 proc_net_init();