diff options
author | Oleg Nesterov <oleg@redhat.com> | 2011-03-24 00:43:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 03:46:58 +0100 |
commit | 52e9fc76d0d4b1e8adeee736172c6c23180059b2 (patch) | |
tree | 61fd430bd5848fc1598373675f8f6810e4af08b4 /fs/proc/root.c | |
parent | pidns: call pid_ns_prepare_proc() from create_pid_namespace() (diff) | |
download | linux-52e9fc76d0d4b1e8adeee736172c6c23180059b2.tar.xz linux-52e9fc76d0d4b1e8adeee736172c6c23180059b2.zip |
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 '')
-rw-r--r-- | fs/proc/root.c | 7 |
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 = { 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(); |