init: clear root_wait on all invalid root= strings
Instead of only clearing root_wait in devt_from_partuuid when the UUID format was invalid, do that in parse_root_device for all strings that failed to parse. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230531125535.676098-15-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
cf056a4312
commit
079caa35f7
|
@ -112,14 +112,14 @@ static int devt_from_partuuid(const char *uuid_str, dev_t *devt)
|
||||||
|
|
||||||
/* Explicitly fail on poor PARTUUID syntax. */
|
/* Explicitly fail on poor PARTUUID syntax. */
|
||||||
if (sscanf(slash + 1, "PARTNROFF=%d%c", &offset, &c) != 1)
|
if (sscanf(slash + 1, "PARTNROFF=%d%c", &offset, &c) != 1)
|
||||||
goto clear_root_wait;
|
goto out_invalid;
|
||||||
cmp.len = slash - uuid_str;
|
cmp.len = slash - uuid_str;
|
||||||
} else {
|
} else {
|
||||||
cmp.len = strlen(uuid_str);
|
cmp.len = strlen(uuid_str);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cmp.len)
|
if (!cmp.len)
|
||||||
goto clear_root_wait;
|
goto out_invalid;
|
||||||
|
|
||||||
dev = class_find_device(&block_class, NULL, &cmp, &match_dev_by_uuid);
|
dev = class_find_device(&block_class, NULL, &cmp, &match_dev_by_uuid);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
|
@ -139,12 +139,9 @@ static int devt_from_partuuid(const char *uuid_str, dev_t *devt)
|
||||||
put_device(dev);
|
put_device(dev);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
clear_root_wait:
|
out_invalid:
|
||||||
pr_err("VFS: PARTUUID= is invalid.\n"
|
pr_err("VFS: PARTUUID= is invalid.\n"
|
||||||
"Expected PARTUUID=<valid-uuid-id>[/PARTNROFF=%%d]\n");
|
"Expected PARTUUID=<valid-uuid-id>[/PARTNROFF=%%d]\n");
|
||||||
if (root_wait)
|
|
||||||
pr_err("Disabling rootwait; root= is invalid.\n");
|
|
||||||
root_wait = 0;
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -611,6 +608,7 @@ static void __init wait_for_root(char *root_device_name)
|
||||||
|
|
||||||
static dev_t __init parse_root_device(char *root_device_name)
|
static dev_t __init parse_root_device(char *root_device_name)
|
||||||
{
|
{
|
||||||
|
int error;
|
||||||
dev_t dev;
|
dev_t dev;
|
||||||
|
|
||||||
if (!strncmp(root_device_name, "mtd", 3) ||
|
if (!strncmp(root_device_name, "mtd", 3) ||
|
||||||
|
@ -623,8 +621,14 @@ static dev_t __init parse_root_device(char *root_device_name)
|
||||||
if (strcmp(root_device_name, "/dev/ram") == 0)
|
if (strcmp(root_device_name, "/dev/ram") == 0)
|
||||||
return Root_RAM0;
|
return Root_RAM0;
|
||||||
|
|
||||||
if (early_lookup_bdev(root_device_name, &dev))
|
error = early_lookup_bdev(root_device_name, &dev);
|
||||||
|
if (error) {
|
||||||
|
if (error == -EINVAL && root_wait) {
|
||||||
|
pr_err("Disabling rootwait; root= is invalid.\n");
|
||||||
|
root_wait = 0;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
return dev;
|
return dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue