Merge tag 'renesas-clocksource-fixes-for-v3.12' into next

[karo-tx-linux.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index e27908b949d48cb2a208837e7eafbe11c7b00fc8..a51cddc2ff8c184e7a7034585190a9fad8ad270b 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -591,16 +591,20 @@ out:
        sys_chroot(".");
 }
 
+static bool is_tmpfs;
 static struct dentry *rootfs_mount(struct file_system_type *fs_type,
        int flags, const char *dev_name, void *data)
 {
        static unsigned long once;
+       void *fill = ramfs_fill_super;
 
        if (test_and_set_bit(0, &once))
                return ERR_PTR(-ENODEV);
 
-       return mount_nodev(fs_type, flags, data,
-               IS_ENABLED(CONFIG_TMPFS) ? shmem_fill_super : ramfs_fill_super);
+       if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
+               fill = shmem_fill_super;
+
+       return mount_nodev(fs_type, flags, data, fill);
 }
 
 static struct file_system_type rootfs_fs_type = {
@@ -616,10 +620,13 @@ int __init init_rootfs(void)
        if (err)
                return err;
 
-       if (IS_ENABLED(CONFIG_TMPFS))
+       if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
+               (!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
                err = shmem_init();
-       else
+               is_tmpfs = true;
+       } else {
                err = init_ramfs_fs();
+       }
 
        if (err)
                unregister_filesystem(&rootfs_fs_type);