LKML Archive mirror
 help / color / mirror / Atom feed
* [PATCH] block: fix rootwait= again
@ 2023-06-09  5:17 Christoph Hellwig
  2023-06-09  9:27 ` Mark Brown
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Christoph Hellwig @ 2023-06-09  5:17 UTC (permalink / raw)
  To: axboe; +Cc: festevam, broonie, linux-kernel

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(-)

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')
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] block: fix rootwait= again
  2023-06-09  5:17 [PATCH] block: fix rootwait= again Christoph Hellwig
@ 2023-06-09  9:27 ` Mark Brown
       [not found] ` <CGME20230609105536eucas1p13a7d4621552a27f7eb117e3f0300740c@eucas1p1.samsung.com>
  2023-06-09 17:38 ` Jens Axboe
  2 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2023-06-09  9:27 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: axboe, festevam, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

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>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] block: fix rootwait= again
       [not found] ` <CGME20230609105536eucas1p13a7d4621552a27f7eb117e3f0300740c@eucas1p1.samsung.com>
@ 2023-06-09 10:55   ` Marek Szyprowski
  0 siblings, 0 replies; 4+ messages in thread
From: Marek Szyprowski @ 2023-06-09 10:55 UTC (permalink / raw)
  To: Christoph Hellwig, axboe; +Cc: festevam, broonie, linux-kernel

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
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] block: fix rootwait= again
  2023-06-09  5:17 [PATCH] block: fix rootwait= again Christoph Hellwig
  2023-06-09  9:27 ` Mark Brown
       [not found] ` <CGME20230609105536eucas1p13a7d4621552a27f7eb117e3f0300740c@eucas1p1.samsung.com>
@ 2023-06-09 17:38 ` Jens Axboe
  2 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2023-06-09 17:38 UTC (permalink / raw)
  To: Christoph Hellwig; +Cc: festevam, broonie, linux-kernel


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,
-- 
Jens Axboe




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-06-09 17:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-09  5:17 [PATCH] block: fix rootwait= again Christoph Hellwig
2023-06-09  9:27 ` Mark Brown
     [not found] ` <CGME20230609105536eucas1p13a7d4621552a27f7eb117e3f0300740c@eucas1p1.samsung.com>
2023-06-09 10:55   ` Marek Szyprowski
2023-06-09 17:38 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).