md/md-bitmap: merge md_bitmap_load() 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-15-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 0c3323e0adb2a0b57c811f5c4995bd126b8c82a5..c3e201fde4c5d97678c846d5705082a728fbf401 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3949,7 +3949,9 @@ static int __load_dirty_region_bitmap(struct raid_set *rs)
        /* Try loading the bitmap unless "raid0", which does not have one */
        if (!rs_is_raid0(rs) &&
            !test_and_set_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags)) {
-               r = md_bitmap_load(&rs->md);
+               struct mddev *mddev = &rs->md;
+
+               r = mddev->bitmap_ops->load(mddev);
                if (r)
                        DMERR("Failed to load bitmap");
        }

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index c534382f0b570002675d43b6f56a745d9db3aaf7..c236754df66e6864e503be0b57824b57349bb7cf 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1977,7 +1977,7 @@ static int bitmap_create(struct mddev *mddev, int slot)
        return 0;
 }
 
-int md_bitmap_load(struct mddev *mddev)
+static int bitmap_load(struct mddev *mddev)
 {
        int err = 0;
        sector_t start = 0;
@@ -2033,7 +2033,6 @@ int md_bitmap_load(struct mddev *mddev)
 out:
        return err;
 }
-EXPORT_SYMBOL_GPL(md_bitmap_load);
 
 /* caller need to free returned bitmap with md_bitmap_free() */
 struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot)
@@ -2425,7 +2424,7 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
                        if (rv)
                                goto out;
 
-                       rv = md_bitmap_load(mddev);
+                       rv = bitmap_load(mddev);
                        if (rv) {
                                mddev->bitmap_info.offset = 0;
                                md_bitmap_destroy(mddev);
@@ -2724,6 +2723,7 @@ const struct attribute_group md_bitmap_group = {
 
 static struct bitmap_operations bitmap_ops = {
        .create                 = bitmap_create,
+       .load                   = bitmap_load,
 };
 
 void mddev_set_bitmap_ops(struct mddev *mddev)

diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index f4c4925102b64812c074b453aa0605cfdf9d549f..f5b04b61d9e9da68aa773bf1a1e56c51a5080fbf 100644 (file)
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -248,13 +248,13 @@ struct md_bitmap_stats {
 
 struct bitmap_operations {
        int (*create)(struct mddev *mddev, int slot);
+       int (*load)(struct mddev *mddev);
 };
 
 /* the bitmap API */
 void mddev_set_bitmap_ops(struct mddev *mddev);
 
 /* these are used only by md/bitmap */
-int md_bitmap_load(struct mddev *mddev);
 void md_bitmap_flush(struct mddev *mddev);
 void md_bitmap_destroy(struct mddev *mddev);
 

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7e774d4aaadd40848868a4379c6a036063f0ede7..9c63be7aa6a5d5f01a900a46720e04ee2a6d5aa2 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6316,7 +6316,8 @@ int do_md_run(struct mddev *mddev)
        err = md_run(mddev);
        if (err)
                goto out;
-       err = md_bitmap_load(mddev);
+
+       err = mddev->bitmap_ops->load(mddev);
        if (err) {
                md_bitmap_destroy(mddev);
                goto out;
@@ -7284,7 +7285,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
                if (fd >= 0) {
                        err = mddev->bitmap_ops->create(mddev, -1);
                        if (!err)
-                               err = md_bitmap_load(mddev);
+                               err = mddev->bitmap_ops->load(mddev);
 
                        if (err) {
                                md_bitmap_destroy(mddev);
@@ -7578,7 +7579,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
                                mddev->bitmap_info.default_space;
                        rv = mddev->bitmap_ops->create(mddev, -1);
                        if (!rv)
-                               rv = md_bitmap_load(mddev);
+                               rv = mddev->bitmap_ops->load(mddev);
 
                        if (rv)
                                md_bitmap_destroy(mddev);