On Sat, May 24, 2025 at 2:18 PM Yu Kuai <yukuai1@xxxxxxxxxxxxxxx> wrote:
>
> From: Yu Kuai <yukuai3@xxxxxxxxxx>
>
> bitmap_startwrite() always return 0, and the caller doesn't check return
> value as well, hence change the method to void.
>
> Also rename startwrite/endwrite to start_write/end_write, which is more in
> line with the usual naming convention.
>
> Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
> ---
> drivers/md/md-bitmap.c | 17 ++++++++---------
> drivers/md/md-bitmap.h | 6 +++---
> drivers/md/md.c | 8 ++++----
> 3 files changed, 15 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
> index 168eea6595b3..2997e09d463d 100644
> --- a/drivers/md/md-bitmap.c
> +++ b/drivers/md/md-bitmap.c
> @@ -1669,13 +1669,13 @@ __acquires(bitmap->lock)
> &(bitmap->bp[page].map[pageoff]);
> }
>
> -static int bitmap_startwrite(struct mddev *mddev, sector_t offset,
> - unsigned long sectors)
> +static void bitmap_start_write(struct mddev *mddev, sector_t offset,
> + unsigned long sectors)
> {
> struct bitmap *bitmap = mddev->bitmap;
>
> if (!bitmap)
> - return 0;
> + return;
>
> while (sectors) {
> sector_t blocks;
> @@ -1685,7 +1685,7 @@ static int bitmap_startwrite(struct mddev *mddev, sector_t offset,
> bmc = md_bitmap_get_counter(&bitmap->counts, offset, &blocks, 1);
> if (!bmc) {
> spin_unlock_irq(&bitmap->counts.lock);
> - return 0;
> + return;
> }
>
> if (unlikely(COUNTER(*bmc) == COUNTER_MAX)) {
> @@ -1721,11 +1721,10 @@ static int bitmap_startwrite(struct mddev *mddev, sector_t offset,
> else
> sectors = 0;
> }
> - return 0;
> }
>
> -static void bitmap_endwrite(struct mddev *mddev, sector_t offset,
> - unsigned long sectors)
> +static void bitmap_end_write(struct mddev *mddev, sector_t offset,
> + unsigned long sectors)
> {
> struct bitmap *bitmap = mddev->bitmap;
>
> @@ -2990,8 +2989,8 @@ static struct bitmap_operations bitmap_ops = {
> .end_behind_write = bitmap_end_behind_write,
> .wait_behind_writes = bitmap_wait_behind_writes,
>
> - .startwrite = bitmap_startwrite,
> - .endwrite = bitmap_endwrite,
> + .start_write = bitmap_start_write,
> + .end_write = bitmap_end_write,
> .start_sync = bitmap_start_sync,
> .end_sync = bitmap_end_sync,
> .cond_end_sync = bitmap_cond_end_sync,
> diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
> index d3d50629af91..9474e0d86fc6 100644
> --- a/drivers/md/md-bitmap.h
> +++ b/drivers/md/md-bitmap.h
> @@ -90,10 +90,10 @@ struct bitmap_operations {
> void (*end_behind_write)(struct mddev *mddev);
> void (*wait_behind_writes)(struct mddev *mddev);
>
> - int (*startwrite)(struct mddev *mddev, sector_t offset,
> + void (*start_write)(struct mddev *mddev, sector_t offset,
> + unsigned long sectors);
> + void (*end_write)(struct mddev *mddev, sector_t offset,
> unsigned long sectors);
> - void (*endwrite)(struct mddev *mddev, sector_t offset,
> - unsigned long sectors);
> bool (*start_sync)(struct mddev *mddev, sector_t offset,
> sector_t *blocks, bool degraded);
> void (*end_sync)(struct mddev *mddev, sector_t offset, sector_t *blocks);
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index b0468e795d94..04a659f40cd6 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -8849,14 +8849,14 @@ static void md_bitmap_start(struct mddev *mddev,
> mddev->pers->bitmap_sector(mddev, &md_io_clone->offset,
> &md_io_clone->sectors);
>
> - mddev->bitmap_ops->startwrite(mddev, md_io_clone->offset,
> - md_io_clone->sectors);
> + mddev->bitmap_ops->start_write(mddev, md_io_clone->offset,
> + md_io_clone->sectors);
> }
>
> static void md_bitmap_end(struct mddev *mddev, struct md_io_clone *md_io_clone)
> {
> - mddev->bitmap_ops->endwrite(mddev, md_io_clone->offset,
> - md_io_clone->sectors);
> + mddev->bitmap_ops->end_write(mddev, md_io_clone->offset,
> + md_io_clone->sectors);
> }
>
> static void md_end_clone_io(struct bio *bio)
> --
> 2.39.2
>
Reviewed-by: Xiao Ni <xni@xxxxxxxxxx>
