Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index db6e5ee0e1db857e430dc7ae68b8d4e680c26ae0..2974c8b3b351b4a15b38acca4478e4032fece9fa 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -325,17 +325,19 @@ static void __init get_fs_names(char *page)
 
 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 {
+       struct super_block *s;
        int err = sys_mount(name, "/root", fs, flags, data);
        if (err)
                return err;
 
        sys_chdir((const char __user __force *)"/root");
-       ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
+       s = current->fs->pwd.dentry->d_sb;
+       ROOT_DEV = s->s_dev;
        printk(KERN_INFO
               "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
-              current->fs->pwd.mnt->mnt_sb->s_type->name,
-              current->fs->pwd.mnt->mnt_sb->s_flags & MS_RDONLY ?
-              " readonly" : "", MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
+              s->s_type->name,
+              s->s_flags & MS_RDONLY ?  " readonly" : "",
+              MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
        return 0;
 }