md/md-bitmap: remove the parameter 'aborted' for md_bitmap_end_sync()

For internal callers, aborted are always set to false, while for
external callers, aborted are always set to true.

Hence there is no need to always pass in true for exported api.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-27-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 57a4bae50e9cfb2cd91eb8d25c0d30374f69add3..7e810fc2852e0ba901ef7cc426914c5207ad488c 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1634,7 +1634,8 @@ static bool bitmap_start_sync(struct mddev *mddev, sector_t offset,
        return rv;
 }
 
-void md_bitmap_end_sync(struct bitmap *bitmap, sector_t offset, sector_t *blocks, int aborted)
+static void __bitmap_end_sync(struct bitmap *bitmap, sector_t offset,
+                             sector_t *blocks, bool aborted)
 {
        bitmap_counter_t *bmc;
        unsigned long flags;
@@ -1663,6 +1664,12 @@ void md_bitmap_end_sync(struct bitmap *bitmap, sector_t offset, sector_t *blocks
  unlock:
        spin_unlock_irqrestore(&bitmap->counts.lock, flags);
 }
+
+void md_bitmap_end_sync(struct bitmap *bitmap, sector_t offset,
+                       sector_t *blocks)
+{
+       __bitmap_end_sync(bitmap, offset, blocks, true);
+}
 EXPORT_SYMBOL(md_bitmap_end_sync);
 
 void md_bitmap_close_sync(struct bitmap *bitmap)
@@ -1676,7 +1683,7 @@ void md_bitmap_close_sync(struct bitmap *bitmap)
        if (!bitmap)
                return;
        while (sector < bitmap->mddev->resync_max_sectors) {
-               md_bitmap_end_sync(bitmap, sector, &blocks, 0);
+               __bitmap_end_sync(bitmap, sector, &blocks, false);
                sector += blocks;
        }
 }
@@ -1704,7 +1711,7 @@ void md_bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector, bool force)
        sector &= ~((1ULL << bitmap->counts.chunkshift) - 1);
        s = 0;
        while (s < sector && s < bitmap->mddev->resync_max_sectors) {
-               md_bitmap_end_sync(bitmap, s, &blocks, 0);
+               __bitmap_end_sync(bitmap, s, &blocks, false);
                s += blocks;
        }
        bitmap->last_end_sync = jiffies;
@@ -1720,7 +1727,7 @@ void md_bitmap_sync_with_cluster(struct mddev *mddev,
        sector_t sector, blocks = 0;
 
        for (sector = old_lo; sector < new_lo; ) {
-               md_bitmap_end_sync(bitmap, sector, &blocks, 0);
+               __bitmap_end_sync(bitmap, sector, &blocks, false);
                sector += blocks;
        }
        WARN((blocks > new_lo) && old_lo, "alignment is not correct for lo\n");

diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index 67c8f22e8726df98d740d570d7f14c77f76a4cf8..6691524bdc80d10322a27171a8e9525c1231cf8d 100644 (file)
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -270,7 +270,8 @@ struct bitmap_operations {
 void mddev_set_bitmap_ops(struct mddev *mddev);
 
 /* these are exported */
-void md_bitmap_end_sync(struct bitmap *bitmap, sector_t offset, sector_t *blocks, int aborted);
+void md_bitmap_end_sync(struct bitmap *bitmap, sector_t offset,
+                       sector_t *blocks);
 void md_bitmap_close_sync(struct bitmap *bitmap);
 void md_bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector, bool force);
 void md_bitmap_sync_with_cluster(struct mddev *mddev,

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 8b83dd83e15f99f1ed7367228ad3a26521f3fbdd..5ee929c89cb1fdd514d8b5e81816fc6686ba1532 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2026,7 +2026,7 @@ static void abort_sync_write(struct mddev *mddev, struct r1bio *r1_bio)
 
        /* make sure these bits don't get cleared. */
        do {
-               md_bitmap_end_sync(mddev->bitmap, s, &sync_blocks, 1);
+               md_bitmap_end_sync(mddev->bitmap, s, &sync_blocks);
                s += sync_blocks;
                sectors_to_go -= sync_blocks;
        } while (sectors_to_go > 0);
@@ -2773,7 +2773,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,
                 */
                if (mddev->curr_resync < max_sector) /* aborted */
                        md_bitmap_end_sync(mddev->bitmap, mddev->curr_resync,
-                                          &sync_blocks, 1);
+                                          &sync_blocks);
                else /* completed sync */
                        conf->fullsync = 0;
 

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index d88878741ed470589b57ef931b62f0b5952af01b..33372d30fa99a29a824b0600aa893a050092744b 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3195,12 +3195,12 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
                if (mddev->curr_resync < max_sector) { /* aborted */
                        if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery))
                                md_bitmap_end_sync(mddev->bitmap, mddev->curr_resync,
-                                                  &sync_blocks, 1);
+                                                  &sync_blocks);
                        else for (i = 0; i < conf->geo.raid_disks; i++) {
                                sector_t sect =
                                        raid10_find_virt(conf, mddev->curr_resync, i);
                                md_bitmap_end_sync(mddev->bitmap, sect,
-                                                  &sync_blocks, 1);
+                                                  &sync_blocks);
                        }
                } else {
                        /* completed sync */

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 313904dd6555b1bda95a4258f6878c8f13454fe4..3e9fed1e11536cdbc2c01bec087f93d24f0904bd 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -6498,7 +6498,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n
 
                if (mddev->curr_resync < max_sector) /* aborted */
                        md_bitmap_end_sync(mddev->bitmap, mddev->curr_resync,
-                                          &sync_blocks, 1);
+                                          &sync_blocks);
                else /* completed sync */
                        conf->fullsync = 0;
                md_bitmap_close_sync(mddev->bitmap);