Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / fs / proc / root.c

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();