Commit e3102722 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

init: rename mount_block_root to mount_root_generic 



mount_block_root is also used to mount non-block file systems, so give
it a better name.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-7-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent f5524c3f

init/do_mounts.c

+3 −3
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int __init do_mount_root(const char *name, const char *fs, 
	return ret;

}



void __init mount_block_root(char *name, int flags)

void __init mount_root_generic(char *name, int flags)

{

	struct page *page = alloc_page(GFP_KERNEL);

	char *fs_names = page_address(page);
@@ -589,7 +589,7 @@ void __init mount_root(void) 


		if (err < 0)

			pr_emerg("Failed to create /dev/root: %d\n", err);

		mount_block_root("/dev/root", root_mountflags);

		mount_root_generic("/dev/root", root_mountflags);

	}

#endif

}
@@ -620,7 +620,7 @@ void __init prepare_namespace(void) 
		root_device_name = saved_root_name;

		if (!strncmp(root_device_name, "mtd", 3) ||

		    !strncmp(root_device_name, "ubi", 3)) {

			mount_block_root(root_device_name, root_mountflags);

			mount_root_generic(root_device_name, root_mountflags);

			goto out;

		}

		ROOT_DEV = name_to_dev_t(root_device_name);

init/do_mounts.h

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

#include <linux/init_syscalls.h>



void  mount_block_root(char *name, int flags);

void  mount_root_generic(char *name, int flags);

void  mount_root(void);

extern int root_mountflags;

init/do_mounts_initrd.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void __init handle_initrd(void) 
	real_root_dev = new_encode_dev(ROOT_DEV);

	create_dev("/dev/root.old", Root_RAM0);

	/* mount initrd on rootfs' /root */

	mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);

	mount_root_generic("/dev/root.old", root_mountflags & ~MS_RDONLY);

	init_mkdir("/old", 0700);

	init_chdir("/old");