block: fix rootwait= again
authorChristoph Hellwig <hch@lst.de>
Fri, 9 Jun 2023 05:17:37 +0000 (07:17 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 9 Jun 2023 17:38:10 +0000 (11:38 -0600)
The previous rootwait fix added an -EINVAL return to a completely
bogus superflous branch, fix this.

Fixes: 1341c7d2ccf4 ("block: fix rootwait=")
Reported-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Fabio Estevam <festevam@gmail.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230609051737.328930-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/early-lookup.c

index 48ea3e9..a5be3c6 100644 (file)
@@ -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 -ENODEV;
+               return 0;
 
        /* try disk name without p<part number> */
        if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')