UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

init: don't remove the /dev/ prefix from error messages 

Remove the code that drops the /dev/ prefix from root_device_name, which
is only used for error messages when mounting the root device fails.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-10-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-05-31 14:55:20 +02:00 committed by Jens Axboe
parent c8643c72bc
commit 73231b58b1
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
init/do_mounts.c
View File

@ -607,8 +607,6 @@ void __init mount_root(char *root_device_name)
*/ */
void __init prepare_namespace(void) void __init prepare_namespace(void)
{ {
char *root_device_name;
if (root_delay) { if (root_delay) {
printk(KERN_INFO "Waiting %d sec before mounting root device...\n", printk(KERN_INFO "Waiting %d sec before mounting root device...\n",
root_delay); root_delay);
@ -627,19 +625,16 @@ void __init prepare_namespace(void)
md_run_setup(); md_run_setup();
if (saved_root_name[0]) { if (saved_root_name[0]) {
root_device_name = saved_root_name; if (!strncmp(saved_root_name, "mtd", 3) ||
if (!strncmp(root_device_name, "mtd", 3) || !strncmp(saved_root_name, "ubi", 3)) {
!strncmp(root_device_name, "ubi", 3)) { mount_root_generic(saved_root_name, saved_root_name,
mount_root_generic(root_device_name, root_device_name,
root_mountflags); root_mountflags);
goto out; goto out;
} }
ROOT_DEV = name_to_dev_t(root_device_name); ROOT_DEV = name_to_dev_t(saved_root_name);
if (strncmp(root_device_name, "/dev/", 5) == 0)
root_device_name += 5;
} }
if (initrd_load(root_device_name)) if (initrd_load(saved_root_name))
goto out; goto out;
/* wait for any asynchronous scanning to complete */ /* wait for any asynchronous scanning to complete */
@ -652,7 +647,7 @@ void __init prepare_namespace(void)
async_synchronize_full(); async_synchronize_full();
} }
mount_root(root_device_name); mount_root(saved_root_name);
out: out:
devtmpfs_mount(); devtmpfs_mount();
init_mount(".", "/", NULL, MS_MOVE, NULL); init_mount(".", "/", NULL, MS_MOVE, NULL);