Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230627034127.4000994-1-linan666@huaweicloud.com> <20230627034127.4000994-2-linan666@huaweicloud.com>
In-Reply-To: <20230627034127.4000994-2-linan666@huaweicloud.com>
From:   Song Liu <song@kernel.org>
Date:   Fri, 7 Jul 2023 16:27:45 +0800
Message-ID: <CAPhsuW65svKXS4GDL6-tuFOEhEwst+0aLd-NA1_gf2LiOuKr_A@mail.gmail.com>
Subject: Re: [PATCH 1/2] md/raid10: a simple cleanup for fix_recovery_read_error
To:     linan666@huaweicloud.com
Cc:     linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
        linan122@huawei.com, yukuai3@huawei.com, yi.zhang@huawei.com,
        houtao1@huawei.com, yangerkun@huawei.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, Jun 27, 2023 at 11:42=E2=80=AFAM <linan666@huaweicloud.com> wrote:
>
> From: Li Nan <linan122@huawei.com>
>
> There is no need to use a new variable 'rdev2' for write device since
> 'rdev' is not used again later. Use 'rdev' directly. Assigning return
> value to 'ok' is also unnecessary. Clean it up.

I actually think rdev2 here makes the code easier to read. And the
'ok' variable doesn't hurt the code readability either.

Thanks,
Song

>
> Signed-off-by: Li Nan <linan122@huawei.com>
> ---
>  drivers/md/raid10.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
> index 4fcfcb350d2b..5105273f60e9 100644
> --- a/drivers/md/raid10.c
> +++ b/drivers/md/raid10.c
> @@ -2590,10 +2590,9 @@ static void fix_recovery_read_error(struct r10bio =
*r10_bio)
>
>                         if (rdev !=3D conf->mirrors[dw].rdev) {
>                                 /* need bad block on destination too */
> -                               struct md_rdev *rdev2 =3D conf->mirrors[d=
w].rdev;
> +                               rdev =3D conf->mirrors[dw].rdev;
>                                 addr =3D r10_bio->devs[1].addr + sect;
> -                               ok =3D rdev_set_badblocks(rdev2, addr, s,=
 0);
> -                               if (!ok) {
> +                               if (!rdev_set_badblocks(rdev, addr, s, 0)=
) {
>                                         /* just abort the recovery */
>                                         pr_notice("md/raid10:%s: recovery=
 aborted due to read error\n",
>                                                   mdname(mddev));
> --
> 2.39.2
>