diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-05-31 14:55:17 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-05 18:55:20 +0200 |
| commit | e3102722ffe77094ba9e7e46380792b3dd8a7abd (patch) | |
| tree | 6b98a90de9990e47d2aaec9c87ee9fdaa4e7ed4e /init/do_mounts.c | |
| parent | init: remove pointless Root_* values (diff) | |
| download | linux-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/do_mounts.c')
| -rw-r--r-- | init/do_mounts.c | 6 |
1 files changed, 3 insertions, 3 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); |