Commit 648fa60f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: don't return -EINVAL for not found names in devt_from_devname 



When we didn't find a device and didn't guess it might be a partition,
it might still show up later, so don't disable rootwait for it by
returning -EINVAL.

Fixes: 079caa35 ("init: clear root_wait on all invalid root= strings")
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230622150644.600327-1-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8270cb10

block/early-lookup.c

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static int __init devt_from_devname(const char *name, dev_t *devt) 
	while (p > s && isdigit(p[-1]))

		p--;

	if (p == s || !*p || *p == '0')

		return -EINVAL;

		return -ENODEV;



	/* try disk name without <part number> */

	part = simple_strtoul(p, NULL, 10);
@@ -186,7 +186,7 @@ static int __init devt_from_devname(const char *name, dev_t *devt) 


	/* try disk name without p<part number> */

	if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')

		return -EINVAL;

		return -ENODEV;

	p[-1] = '\0';

	*devt = blk_lookup_devt(s, part);

	if (*devt)