diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts.c | 24 | ||||
| -rw-r--r-- | init/main.c | 1 |
2 files changed, 3 insertions, 22 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 2d1ea3028454..53cb37b66227 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -630,41 +630,23 @@ 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); - 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 = { +struct file_system_type rootfs_fs_type = { .name = "rootfs", .mount = rootfs_mount, .kill_sb = kill_litter_super, }; -int __init init_rootfs(void) +void __init init_rootfs(void) { - int err = register_filesystem(&rootfs_fs_type); - - if (err) - return err; - if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] && - (!root_fs_names || strstr(root_fs_names, "tmpfs"))) { - err = shmem_init(); + (!root_fs_names || strstr(root_fs_names, "tmpfs"))) is_tmpfs = true; - } else { - err = init_ramfs_fs(); - } - - if (err) - unregister_filesystem(&rootfs_fs_type); - - return err; } diff --git a/init/main.c b/init/main.c index ff5803b0841c..96f8d5af52d6 100644 --- a/init/main.c +++ b/init/main.c @@ -1025,7 +1025,6 @@ static void __init do_initcalls(void) static void __init do_basic_setup(void) { cpuset_init_smp(); - shmem_init(); driver_init(); init_irq_proc(); do_ctors(); |