2019-09-23 13:40:56

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH] md/raid0: Fix an error message in raid0_make_request()

The first argument to WARN() is supposed to be a condition. The
original code will just print the mdname() instead of the full warning
message.

Fixes: c84a1372df92 ("md/raid0: avoid RAID0 data corruption due to layout confusion.")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/md/raid0.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index f61693e59684..3956ea502f97 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -615,7 +615,7 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)
tmp_dev = map_sector(mddev, zone, sector, &sector);
break;
default:
- WARN("md/raid0:%s: Invalid layout\n", mdname(mddev));
+ WARN(1, "md/raid0:%s: Invalid layout\n", mdname(mddev));
bio_io_error(bio);
return true;
}
--
2.20.1


2019-10-02 06:09:46

by Song Liu

[permalink] [raw]
Subject: Re: [PATCH] md/raid0: Fix an error message in raid0_make_request()

On Fri, Sep 20, 2019 at 11:00 PM Dan Carpenter <[email protected]> wrote:
>
> The first argument to WARN() is supposed to be a condition. The
> original code will just print the mdname() instead of the full warning
> message.
>
> Fixes: c84a1372df92 ("md/raid0: avoid RAID0 data corruption due to layout confusion.")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> drivers/md/raid0.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
> index f61693e59684..3956ea502f97 100644
> --- a/drivers/md/raid0.c
> +++ b/drivers/md/raid0.c
> @@ -615,7 +615,7 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)
> tmp_dev = map_sector(mddev, zone, sector, &sector);
> break;
> default:
> - WARN("md/raid0:%s: Invalid layout\n", mdname(mddev));
> + WARN(1, "md/raid0:%s: Invalid layout\n", mdname(mddev));
> bio_io_error(bio);
> return true;

Applied. Thanks for the fix!

Song