2023-06-09 05:39:32

by Christoph Hellwig

[permalink] [raw]

Subject: [PATCH] block: fix rootwait= again

---

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 <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
Tested-by: Fabio Estevam <[email protected]>
---
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

2023-06-09 10:05:52

by Mark Brown

[permalink] [raw]

Subject: Re: [PATCH] block: fix rootwait= again

---

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 <[email protected]>
> Signed-off-by: Christoph Hellwig <[email protected]>
> Tested-by: Fabio Estevam <[email protected]>

Tested-by: Mark Brown <[email protected]>

---

Attachments:

(No filename) (419.00 B)
signature.asc (499.00 B)
Download all attachments

2023-06-09 11:15:33

by Marek Szyprowski

[permalink] [raw]

Subject: Re: [PATCH] block: fix rootwait= again

---

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 <[email protected]>
> Signed-off-by: Christoph Hellwig <[email protected]>
> Tested-by: Fabio Estevam <[email protected]>

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

Tested-by: Marek Szyprowski <[email protected]>


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

2023-06-09 17:44:43

by Jens Axboe

[permalink] [raw]

Subject: Re: [PATCH] block: fix rootwait= again

---

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