aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/root.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2011-03-23 19:43:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 22:46:58 -0400
commit52e9fc76d0d4b1e8adeee736172c6c23180059b2 (patch)
tree61fd430bd5848fc1598373675f8f6810e4af08b4 /fs/proc/root.c
parent4308eebbeb2026827d4492ce8c23d99f7f144a82 (diff)
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>
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r--fs/proc/root.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c
index e5e2bfa7a03b..a9000e9cfee5 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -90,19 +90,20 @@ static struct file_system_type proc_fs_type = {
90 90
91void __init proc_root_init(void) 91void __init proc_root_init(void)
92{ 92{
93 struct vfsmount *mnt;
93 int err; 94 int err;
94 95
95 proc_init_inodecache(); 96 proc_init_inodecache();
96 err = register_filesystem(&proc_fs_type); 97 err = register_filesystem(&proc_fs_type);
97 if (err) 98 if (err)
98 return; 99 return;
99 proc_mnt = kern_mount_data(&proc_fs_type, &init_pid_ns); 100 mnt = kern_mount_data(&proc_fs_type, &init_pid_ns);
100 if (IS_ERR(proc_mnt)) { 101 if (IS_ERR(mnt)) {
101 unregister_filesystem(&proc_fs_type); 102 unregister_filesystem(&proc_fs_type);
102 return; 103 return;
103 } 104 }
104 105
105 init_pid_ns.proc_mnt = proc_mnt; 106 init_pid_ns.proc_mnt = mnt;
106 proc_symlink("mounts", NULL, "self/mounts"); 107 proc_symlink("mounts", NULL, "self/mounts");
107 108
108 proc_net_init(); 109 proc_net_init();