Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57f150a5 authored by Rob Landley's avatar Rob Landley Committed by Linus Torvalds
Browse files

initmpfs: move rootfs code from fs/ramfs/ to init/ 



When the rootfs code was a wrapper around ramfs, having them in the same
file made sense.  Now that it can wrap another filesystem type, move it in
with the init code instead.

This also allows a subsequent patch to access rootfstype= command line
arg.

Signed-off-by: default avatarRob Landley <rob@landley.net>
Cc: Jeff Layton <jlayton@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4bbee76b

fs/namespace.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/security.h>

#include <linux/idr.h>

#include <linux/acct.h>		/* acct_auto_close_mnt */

#include <linux/ramfs.h>	/* init_rootfs */

#include <linux/init.h>		/* init_rootfs */

#include <linux/fs_struct.h>	/* get_fs_root et.al. */

#include <linux/fsnotify.h>	/* fsnotify_vfsmount_delete */

#include <linux/uaccess.h>

fs/ramfs/inode.c

+1 −31
Original line number Diff line number Diff line
@@ -244,17 +244,6 @@ struct dentry *ramfs_mount(struct file_system_type *fs_type, 
	return mount_nodev(fs_type, flags, data, ramfs_fill_super);

}



static struct dentry *rootfs_mount(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data)

{

	static unsigned long once;



	if (test_and_set_bit(0, &once))

		return ERR_PTR(-ENODEV);



	return mount_nodev(fs_type, flags, data, ramfs_fill_super);

}



static void ramfs_kill_sb(struct super_block *sb)

{

	kfree(sb->s_fs_info);
@@ -267,13 +256,8 @@ static struct file_system_type ramfs_fs_type = { 
	.kill_sb	= ramfs_kill_sb,

	.fs_flags	= FS_USERNS_MOUNT,

};

static struct file_system_type rootfs_fs_type = {

	.name		= "rootfs",

	.mount		= rootfs_mount,

	.kill_sb	= kill_litter_super,

};



static int __init init_ramfs_fs(void)

int __init init_ramfs_fs(void)

{

	static unsigned long once;

	int err;
@@ -292,17 +276,3 @@ static int __init init_ramfs_fs(void) 
	return err;

}

module_init(init_ramfs_fs)
 


int __init init_rootfs(void)

{

	int err = register_filesystem(&rootfs_fs_type);



	if (err)

		return err;



	err = init_ramfs_fs();

	if (err)

		unregister_filesystem(&rootfs_fs_type);



	return err;

}

include/linux/init.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ extern unsigned int reset_devices; 
void setup_arch(char **);

void prepare_namespace(void);

void __init load_default_modules(void);

int __init init_rootfs(void);



extern void (*late_time_init)(void);

include/linux/ramfs.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma); 


extern const struct file_operations ramfs_file_operations;

extern const struct vm_operations_struct generic_file_vm_ops;

extern int __init init_rootfs(void);

extern int __init init_ramfs_fs(void);



int ramfs_fill_super(struct super_block *sb, void *data, int silent);

init/do_mounts.c

+32 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/async.h>

#include <linux/fs_struct.h>

#include <linux/slab.h>

#include <linux/ramfs.h>



#include <linux/nfs_fs.h>

#include <linux/nfs_fs_sb.h>
@@ -588,3 +589,34 @@ out: 
	sys_mount(".", "/", NULL, MS_MOVE, NULL);

	sys_chroot(".");

}



static struct dentry *rootfs_mount(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data)

{

	static unsigned long once;



	if (test_and_set_bit(0, &once))

		return ERR_PTR(-ENODEV);



	return mount_nodev(fs_type, flags, data, ramfs_fill_super);

}



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;



	err = init_ramfs_fs();

	if (err)

		unregister_filesystem(&rootfs_fs_type);



	return err;

}