diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-01 16:39:28 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-01 16:39:28 +1000 |
commit | 4a8a3adf569478bf35b8053f2bb575e0c0f01203 (patch) | |
tree | a3582c7858bdda54f5c7378cd06e40cd33e291b0 /init | |
parent | 5dba7148d818bde112fad5caa04e9a65e5058a95 (diff) | |
parent | 36313f80580549c66d185f0548df24cfe043bbb8 (diff) |
Merge branch 'akpm-current/current'
Conflicts:
fs/binfmt_elf.c
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index c84fedb12c24..6df7405ce85d 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -26,6 +26,8 @@ #include <linux/async.h> #include <linux/fs_struct.h> #include <linux/slab.h> +#include <linux/ramfs.h> +#include <linux/shmem_fs.h> #include <linux/nfs_fs.h> #include <linux/nfs_fs_sb.h> @@ -588,3 +590,46 @@ out: sys_mount(".", "/", NULL, MS_MOVE, NULL); 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); + + 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 = { + .name = "rootfs", + .mount = rootfs_mount, + .kill_sb = kill_litter_super, +}; + +int __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(); + is_tmpfs = true; + } else { + err = init_ramfs_fs(); + } + + if (err) + unregister_filesystem(&rootfs_fs_type); + + return err; +} |