Merge tag 'powerpc-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[mirror_ubuntu-focal-kernel.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 53cb37b66227f6a6d484bc961edd4bf99b811541..9634ecf3743db3666e27d3c38a1764148e3c6766 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -627,20 +627,17 @@ out:
 }
 
 static bool is_tmpfs;
-static struct dentry *rootfs_mount(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data)
+static int rootfs_init_fs_context(struct fs_context *fc)
 {
-       void *fill = ramfs_fill_super;
-
        if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs)
-               fill = shmem_fill_super;
+               return shmem_init_fs_context(fc);
 
-       return mount_nodev(fs_type, flags, data, fill);
+       return ramfs_init_fs_context(fc);
 }
 
 struct file_system_type rootfs_fs_type = {
        .name           = "rootfs",
-       .mount          = rootfs_mount,
+       .init_fs_context = rootfs_init_fs_context,
        .kill_sb        = kill_litter_super,
 };