md/md-bitmap: cleanup bitmap_ops->startwrite()

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.

Link: https://lore.kernel.org/linux-raid/20250524061320.370630-4-yukuai1@huaweicloud.com
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Xiao Ni <xni@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 931623b4d4a65fbd216c7f459922366fdf1278be..e415219d1f232022943a5020896bcbe3fd3198d6 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1682,13 +1682,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;
@@ -1698,7 +1698,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)) {
@@ -1734,11 +1734,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;
 
@@ -3013,8 +3012,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 08a9dfb696731f9f5035a6e56a22fa07c694cb2a..96f09d620f33b0784be7b1efa541ec23559daf92 100644 (file)
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -80,10 +80,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 0fde115e921ff946844fc233ce19e54a55a36619..d0d9144ced5b9382b613589130a03e9a58e510aa 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8799,14 +8799,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)