path: root/init
diff options
authorAl Viro <viro@zeniv.linux.org.uk>2019-05-30 17:48:35 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2019-07-04 22:01:59 -0400
commitfd3e007f6c6a0f677e4ee8aca4b9bab8ad6cab9a (patch)
tree88755e938018b0f3b2d66aa86cdbfafd16e99529 /init
parent14a253ce4210cd2ef133b392062477e9d656db4a (diff)
don't bother with registering rootfs
init_mount_tree() can get to rootfs_fs_type directly and that simplifies a lot of things. We don't need to register it, we don't need to look it up *and* we don't need to bother with preventing subsequent userland mounts. That's the way we should've done that from the very beginning. There is a user-visible change, namely the disappearance of "rootfs" from /proc/filesystems. Note that it's been unmountable all along and it didn't show up in /proc/mounts; however, it *is* a user-visible change and theoretically some script might've been using its presence in /proc/filesystems to tell 2.4.11+ from earlier kernels. *IF* any complaints about behaviour change do show up, we could fake it in /proc/filesystems. I very much doubt we'll have to, though. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'init')
1 files changed, 2 insertions, 13 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index c170d8b309b1..e7f0b0f18cce 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -629,19 +629,15 @@ 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,
@@ -649,19 +645,12 @@ static struct file_system_type rootfs_fs_type = {
int __init init_rootfs(void)
- int err = register_filesystem(&rootfs_fs_type);
- if (err)
- return err;
+ int err = 0;
if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] &&
(!root_fs_names || strstr(root_fs_names, "tmpfs"))) {
err = shmem_init();
is_tmpfs = true;
- if (err)
- unregister_filesystem(&rootfs_fs_type);
return err;

Privacy Policy