diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-06-07 15:57:46 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-07 08:00:14 -0600 |
| commit | 1341c7d2ccf42ed91aea80b8579d35bc1ea381e2 (patch) | |
| tree | 9cb137040b389326e0b6ace0a2652376e387cf7a /block | |
| parent | 3d2af77e31ade05ff7ccc3658c3635ec1bea0979 (diff) | |
| download | linux-1341c7d2ccf42ed91aea80b8579d35bc1ea381e2.tar.gz linux-1341c7d2ccf42ed91aea80b8579d35bc1ea381e2.tar.bz2 linux-1341c7d2ccf42ed91aea80b8579d35bc1ea381e2.zip | |
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 <festevam@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20230607135746.92995-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/early-lookup.c | 4 |
1 files changed, 2 insertions, 2 deletions
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<part number> */ 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) |