Commit 73231b58 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230531125535.676098-10-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c8643c72
......@@ -607,8 +607,6 @@ void __init mount_root(char *root_device_name)
*/
void __init prepare_namespace(void)
{
char *root_device_name;
if (root_delay) {
printk(KERN_INFO "Waiting %d sec before mounting root device...\n",
root_delay);
......@@ -627,19 +625,16 @@ void __init prepare_namespace(void)
md_run_setup();
if (saved_root_name[0]) {
root_device_name = saved_root_name;
if (!strncmp(root_device_name, "mtd", 3) ||
!strncmp(root_device_name, "ubi", 3)) {
mount_root_generic(root_device_name, root_device_name,
if (!strncmp(saved_root_name, "mtd", 3) ||
!strncmp(saved_root_name, "ubi", 3)) {
mount_root_generic(saved_root_name, saved_root_name,
root_mountflags);
goto out;
}
ROOT_DEV = name_to_dev_t(root_device_name);
if (strncmp(root_device_name, "/dev/", 5) == 0)
root_device_name += 5;
ROOT_DEV = name_to_dev_t(saved_root_name);
}
if (initrd_load(root_device_name))
if (initrd_load(saved_root_name))
goto out;
/* wait for any asynchronous scanning to complete */
......@@ -652,7 +647,7 @@ void __init prepare_namespace(void)
async_synchronize_full();
}
mount_root(root_device_name);
mount_root(saved_root_name);
out:
devtmpfs_mount();
init_mount(".", "/", NULL, MS_MOVE, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment