summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-05-31 14:55:17 +0200
committerJens Axboe <axboe@kernel.dk>2023-06-05 18:55:20 +0200
commite3102722ffe77094ba9e7e46380792b3dd8a7abd (patch)
tree6b98a90de9990e47d2aaec9c87ee9fdaa4e7ed4e /init
parentinit: remove pointless Root_* values (diff)
downloadlinux-e3102722ffe77094ba9e7e46380792b3dd8a7abd.tar.xz
linux-e3102722ffe77094ba9e7e46380792b3dd8a7abd.zip
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: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230531125535.676098-7-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts.c6
-rw-r--r--init/do_mounts.h2
-rw-r--r--init/do_mounts_initrd.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 2fe7901b5bcf..a2c0baace099 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -391,7 +391,7 @@ out:
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);
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 7a29ac3e427b..33623025f695 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -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;
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 34731241377d..686d1ff3af4b 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -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");