From 1341c7d2ccf42ed91aea80b8579d35bc1ea381e2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 7 Jun 2023 15:57:46 +0200 Subject: block: fix rootwait= Failures to look up the gendisk must return -ENODEV so that rootwait retries the lookup instead of -EINVAL which exits early. Fixes: cf056a431215 ("init: improve the name_to_dev_t interface") Reported-by: Fabio Estevam Signed-off-by: Christoph Hellwig Tested-by: Fabio Estevam Link: https://lore.kernel.org/r/20230607135746.92995-1-hch@lst.de Signed-off-by: Jens Axboe --- block/early-lookup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'block/early-lookup.c') diff --git a/block/early-lookup.c b/block/early-lookup.c index 3ff0d2e4dcbf..48ea3e982419 100644 --- a/block/early-lookup.c +++ b/block/early-lookup.c @@ -181,7 +181,7 @@ static int __init devt_from_devname(const char *name, dev_t *devt) *p = '\0'; *devt = blk_lookup_devt(s, part); if (*devt) - return 0; + return -ENODEV; /* try disk name without p */ if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p') @@ -190,7 +190,7 @@ static int __init devt_from_devname(const char *name, dev_t *devt) *devt = blk_lookup_devt(s, part); if (*devt) return 0; - return -EINVAL; + return -ENODEV; } static int __init devt_from_devnum(const char *name, dev_t *devt) -- cgit