md/md-bitmap: merge md_bitmap_status() into bitmap_operations

So that the implementation won't be exposed, and it'll be possible
to invent a new bitmap by replacing bitmap_operations.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-20-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 23c7d4be3ffdf2318ceb2097ee127d86a5b62ef6..b2fbec3997f2db9b8242d259113f26534e9775a1 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -2105,7 +2105,7 @@ void md_bitmap_set_pages(struct bitmap *bitmap, unsigned long pages)
 }
 EXPORT_SYMBOL_GPL(md_bitmap_set_pages);
 
-int md_bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats)
+static int bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats)
 {
        struct bitmap_storage *storage;
        struct bitmap_counts *counts;
@@ -2131,7 +2131,6 @@ int md_bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats)
        stats->events_cleared = bitmap->events_cleared;
        return 0;
 }
-EXPORT_SYMBOL_GPL(md_bitmap_get_stats);
 
 int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
                  int chunksize, int init)
@@ -2723,6 +2722,7 @@ static struct bitmap_operations bitmap_ops = {
        .flush                  = bitmap_flush,
 
        .update_sb              = bitmap_update_sb,
+       .get_stats              = bitmap_get_stats,
 };
 
 void mddev_set_bitmap_ops(struct mddev *mddev)

diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index ca0d8696136f6596ee31b7dc9c3b1b143e09291a..1df238cb82f09fdb879b95fc268ce9123f18c0da 100644 (file)
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -253,6 +253,7 @@ struct bitmap_operations {
        void (*flush)(struct mddev *mddev);
 
        void (*update_sb)(struct bitmap *bitmap);
+       int (*get_stats)(struct bitmap *bitmap, struct md_bitmap_stats *stats);
 };
 
 /* the bitmap API */
@@ -260,8 +261,6 @@ void mddev_set_bitmap_ops(struct mddev *mddev);
 
 /* these are used only by md/bitmap */
 
-int md_bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats);
-
 int  md_bitmap_setallbits(struct bitmap *bitmap);
 void md_bitmap_write_all(struct bitmap *bitmap);
 

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index ca30881556bdf4dd84e9a01a63228f030bdea41a..a5f1135cc1fa9290a6b099ae8fc4e297e099e8be 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1148,7 +1148,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
        unsigned long my_pages;
        int i, rv;
 
-       rv = md_bitmap_get_stats(bitmap, &stats);
+       rv = mddev->bitmap_ops->get_stats(bitmap, &stats);
        if (rv)
                return rv;
 
@@ -1175,7 +1175,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
                        goto out;
                }
 
-               rv = md_bitmap_get_stats(bitmap, &stats);
+               rv = mddev->bitmap_ops->get_stats(bitmap, &stats);
                if (rv)
                        goto out;
                /*
@@ -1225,7 +1225,7 @@ static int cluster_check_sync_size(struct mddev *mddev)
        char str[64];
        int i, rv;
 
-       rv = md_bitmap_get_stats(bitmap, &stats);
+       rv = mddev->bitmap_ops->get_stats(bitmap, &stats);
        if (rv)
                return rv;
 
@@ -1258,7 +1258,7 @@ static int cluster_check_sync_size(struct mddev *mddev)
                        mddev->bitmap_ops->update_sb(bitmap);
                lockres_free(bm_lockres);
 
-               rv = md_bitmap_get_stats(bitmap, &stats);
+               rv = mddev->bitmap_ops->get_stats(bitmap, &stats);
                if (rv) {
                        md_bitmap_free(bitmap);
                        return rv;

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 5f9df96eab51d7dea7259c8c741e47fa26006891..6c184748f31744d339297f44bfa0a0152294a8c2 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1378,7 +1378,7 @@ static u64 md_bitmap_events_cleared(struct mddev *mddev)
        struct md_bitmap_stats stats;
        int err;
 
-       err = md_bitmap_get_stats(mddev->bitmap, &stats);
+       err = mddev->bitmap_ops->get_stats(mddev->bitmap, &stats);
        if (err)
                return 0;
 
@@ -2354,11 +2354,12 @@ super_1_allow_new_offset(struct md_rdev *rdev,
                return 0;
 
        if (!rdev->mddev->bitmap_info.file) {
+               struct mddev *mddev = rdev->mddev;
                struct md_bitmap_stats stats;
                int err;
 
-               err = md_bitmap_get_stats(rdev->mddev->bitmap, &stats);
-               if (!err && rdev->sb_start + rdev->mddev->bitmap_info.offset +
+               err = mddev->bitmap_ops->get_stats(mddev->bitmap, &stats);
+               if (!err && rdev->sb_start + mddev->bitmap_info.offset +
                    stats.file_pages * (PAGE_SIZE >> 9) > new_offset)
                        return 0;
        }
@@ -7588,7 +7589,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
                } else {
                        struct md_bitmap_stats stats;
 
-                       rv = md_bitmap_get_stats(mddev->bitmap, &stats);
+                       rv = mddev->bitmap_ops->get_stats(mddev->bitmap, &stats);
                        if (rv)
                                goto err;
 
@@ -8388,7 +8389,7 @@ static void md_bitmap_status(struct seq_file *seq, struct mddev *mddev)
        unsigned long chunk_kb;
        int err;
 
-       err = md_bitmap_get_stats(mddev->bitmap, &stats);
+       err = mddev->bitmap_ops->get_stats(mddev->bitmap, &stats);
        if (err)
                return;
 

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b6c4e44f9b4bae85beb6ef52e793fcafc13f386f..d490a9ac484f8c8c9c2353cb6bb15f11af9e960b 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1599,7 +1599,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                         * Not if there are too many, or cannot
                         * allocate memory, or a reader on WriteMostly
                         * is waiting for behind writes to flush */
-                       err = md_bitmap_get_stats(bitmap, &stats);
+                       err = mddev->bitmap_ops->get_stats(bitmap, &stats);
                        if (!err && write_behind && !stats.behind_wait &&
                            stats.behind_writes < max_write_behind)
                                alloc_behind_master_bio(r1_bio, bio);