diff mbox series

block: fix rootwait= again

Message ID 20230609051737.328930-1-hch@lst.de
State New
Headers
Series block: fix rootwait= again |

Commit Message

Christoph Hellwig June 9, 2023, 5:17 a.m. UTC 
  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>
---
 block/early-lookup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown June 9, 2023, 9:27 a.m. UTC | #1 
On Fri, Jun 09, 2023 at 07:17:37AM +0200, Christoph Hellwig wrote:
> 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: Mark Brown <broonie@kernel.org>
Marek Szyprowski June 9, 2023, 10:55 a.m. UTC | #2 
On 09.06.2023 07:17, Christoph Hellwig wrote:
> 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>

This fixes the issue I've found in today's next-20230609.

Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>


> ---
>   block/early-lookup.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/early-lookup.c b/block/early-lookup.c
> index 48ea3e982419cc..a5be3c68ed079c 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 -ENODEV;
> +		return 0;
>   
>   	/* try disk name without p<part number> */
>   	if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')

Best regards
Jens Axboe June 9, 2023, 5:38 p.m. UTC | #3 
On Fri, 09 Jun 2023 07:17:37 +0200, Christoph Hellwig wrote:
> The previous rootwait fix added an -EINVAL return to a completely
> bogus superflous branch, fix this.
> 
> 

Applied, thanks!

[1/1] block: fix rootwait= again
      commit: bb91a7d96a5c9662f41a08024f405bf9ad333e86

Best regards,
diff mbox series

Patch

diff --git a/block/early-lookup.c b/block/early-lookup.c
index 48ea3e982419cc..a5be3c68ed079c 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 -ENODEV;
+		return 0;
 
 	/* try disk name without p<part number> */
 	if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')