[PATCH RFC -next v2 12/41] md/md-bitmap: merge md_bitmap_create() into bitmap_operations

Yu Kuai
2024-08-14T07:15:33Z

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>
---
drivers/md/md-bitmap.c | 11 ++++++-----
drivers/md/md-bitmap.h | 2 +-
drivers/md/md.c | 6 +++---
3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 75e58da9a1a5..9606bcafb834 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1879,7 +1879,7 @@ void md_bitmap_destroy(struct mddev *mddev)
* if this returns an error, bitmap_destroy must be called to do clean up
* once mddev->bitmap is set
*/
-static struct bitmap *bitmap_create(struct mddev *mddev, int slot)
+static struct bitmap *__bitmap_create(struct mddev *mddev, int slot)
{
struct bitmap *bitmap;
sector_t blocks = mddev->resync_max_sectors;
@@ -1966,9 +1966,9 @@ static struct bitmap *bitmap_create(struct mddev *mddev, int slot)
return ERR_PTR(err);
}

-int md_bitmap_create(struct mddev *mddev, int slot)
+static int bitmap_create(struct mddev *mddev, int slot)
{
- struct bitmap *bitmap = bitmap_create(mddev, slot);
+ struct bitmap *bitmap = __bitmap_create(mddev, slot);

if (IS_ERR(bitmap))
return PTR_ERR(bitmap);
@@ -2041,7 +2041,7 @@ struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot)
int rv = 0;
struct bitmap *bitmap;

- bitmap = bitmap_create(mddev, slot);
+ bitmap = __bitmap_create(mddev, slot);
if (IS_ERR(bitmap)) {
rv = PTR_ERR(bitmap);
return ERR_PTR(rv);
@@ -2418,7 +2418,7 @@ location_store(struct mddev *mddev, const char *buf, size_t len)
}

mddev->bitmap_info.offset = offset;
- rv = md_bitmap_create(mddev, -1);
+ rv = bitmap_create(mddev, -1);
if (rv)
goto out;

@@ -2720,6 +2720,7 @@ const struct attribute_group md_bitmap_group = {
};

static struct bitmap_operations bitmap_ops = {
+ .create = bitmap_create,
};

void mddev_set_bitmap_ops(struct mddev *mddev)
diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index e187f9099f2e..4b9c22b66e65 100644
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -246,13 +246,13 @@ struct md_bitmap_stats {
};

struct bitmap_operations {
+ int (*create)(struct mddev *mddev, int slot);
};

/* the bitmap API */
void mddev_set_bitmap_ops(struct mddev *mddev);

/* these are used only by md/bitmap */
-int md_bitmap_create(struct mddev *mddev, int slot);
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 6e130f6c2abd..b32ab7ca7640 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6211,7 +6211,7 @@ int md_run(struct mddev *mddev)
}
if (err == 0 && pers->sync_request &&
(mddev->bitmap_info.file || mddev->bitmap_info.offset)) {
- err = md_bitmap_create(mddev, -1);
+ err = mddev->bitmap_ops->create(mddev, -1);
if (err)
pr_warn("%s: failed to create bitmap (%d)\n",
mdname(mddev), err);
@@ -7269,7 +7269,7 @@ static int set_bitmap_file(struct mddev *mddev, int fd)
err = 0;
if (mddev->pers) {
if (fd >= 0) {
- err = md_bitmap_create(mddev, -1);
+ err = mddev->bitmap_ops->create(mddev, -1);
if (!err)
err = md_bitmap_load(mddev);

@@ -7563,7 +7563,7 @@ static int update_array_info(struct mddev *mddev, mdu_array_info_t *info)
mddev->bitmap_info.default_offset;
mddev->bitmap_info.space =
mddev->bitmap_info.default_space;
- rv = md_bitmap_create(mddev, -1);
+ rv = mddev->bitmap_ops->create(mddev, -1);
if (!rv)
rv = md_bitmap_load(mddev);

--
2.39.2