Commit 14a253ce authored by Al Viro's avatar Al Viro

init_rootfs(): don't bother with init_ramfs_fs()

the only thing done by the latter is making ramfs visible
to mount(2); we don't need it there - rootfs is separate
and, in fact, made visible to mount(2) in the same init_rootfs().
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 5afdd0f1
...@@ -266,12 +266,8 @@ static struct file_system_type ramfs_fs_type = { ...@@ -266,12 +266,8 @@ static struct file_system_type ramfs_fs_type = {
.fs_flags = FS_USERNS_MOUNT, .fs_flags = FS_USERNS_MOUNT,
}; };
int __init init_ramfs_fs(void) static int __init init_ramfs_fs(void)
{ {
static unsigned long once;
if (test_and_set_bit(0, &once))
return 0;
return register_filesystem(&ramfs_fs_type); return register_filesystem(&ramfs_fs_type);
} }
fs_initcall(init_ramfs_fs); fs_initcall(init_ramfs_fs);
...@@ -19,7 +19,6 @@ extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize); ...@@ -19,7 +19,6 @@ extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize);
extern const struct file_operations ramfs_file_operations; extern const struct file_operations ramfs_file_operations;
extern const struct vm_operations_struct generic_file_vm_ops; extern const struct vm_operations_struct generic_file_vm_ops;
extern int __init init_ramfs_fs(void);
int ramfs_fill_super(struct super_block *sb, void *data, int silent); int ramfs_fill_super(struct super_block *sb, void *data, int silent);
......
...@@ -658,8 +658,6 @@ int __init init_rootfs(void) ...@@ -658,8 +658,6 @@ int __init init_rootfs(void)
(!root_fs_names || strstr(root_fs_names, "tmpfs"))) { (!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
err = shmem_init(); err = shmem_init();
is_tmpfs = true; is_tmpfs = true;
} else {
err = init_ramfs_fs();
} }
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment