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>

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 2fe7901..a2c0baa 100644 (file)
--- 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 7a29ac3..3362302 100644 (file)
--- 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 3473124..686d1ff 100644 (file)
--- 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");