On Sat, May 24, 2025 at 2:18 PM Yu Kuai <yukuai1@xxxxxxxxxxxxxxx> wrote:
>
> From: Yu Kuai <yukuai3@xxxxxxxxxx>
>
> There are no functional changes, the helper will be used by llbitmap in
> following patches.
>
> Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
> ---
> drivers/md/md.c | 9 +--------
> drivers/md/md.h | 6 ++++++
> 2 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index 18e03f651f6b..b0468e795d94 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -9037,19 +9037,12 @@ static sector_t md_sync_position(struct mddev *mddev, enum sync_action action)
>
> static bool sync_io_within_limit(struct mddev *mddev)
> {
> - int io_sectors;
> -
> /*
> * For raid456, sync IO is stripe(4k) per IO, for other levels, it's
> * RESYNC_PAGES(64k) per IO.
> */
> - if (mddev->level == 4 || mddev->level == 5 || mddev->level == 6)
> - io_sectors = 8;
> - else
> - io_sectors = 128;
> -
> return atomic_read(&mddev->recovery_active) <
> - io_sectors * sync_io_depth(mddev);
> + (raid_is_456(mddev) ? 8 : 128) * sync_io_depth(mddev);
> }
>
> #define SYNC_MARKS 10
> diff --git a/drivers/md/md.h b/drivers/md/md.h
> index 5ba4a9093a92..c241119e6ef3 100644
> --- a/drivers/md/md.h
> +++ b/drivers/md/md.h
> @@ -1011,6 +1011,12 @@ static inline bool mddev_is_dm(struct mddev *mddev)
> return !mddev->gendisk;
> }
>
> +static inline bool raid_is_456(struct mddev *mddev)
> +{
> + return mddev->level == ID_RAID4 || mddev->level == ID_RAID5 ||
> + mddev->level == ID_RAID6;
> +}
> +
> static inline void mddev_trace_remap(struct mddev *mddev, struct bio *bio,
> sector_t sector)
> {
> --
> 2.39.2
>
Reviewed-by: Xiao Ni <xni@xxxxxxxxxx>
