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

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

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

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-bitmap.c | 7 ++-----
drivers/md/md-bitmap.h | 3 +--
drivers/md/md-cluster.c | 12 ++++++------
3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index f53e3a62c4e2..eb7c5e552acf 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1828,10 +1828,7 @@ static void bitmap_flush(struct mddev *mddev)
bitmap_update_sb(bitmap);
}

-/*
- * free memory that was allocated
- */
-void md_bitmap_free(struct bitmap *bitmap)
+static void md_bitmap_free(struct bitmap *bitmap)
{
unsigned long k, pages;
struct bitmap_page *bp;
@@ -1865,7 +1862,6 @@ void md_bitmap_free(struct bitmap *bitmap)
kfree(bp);
kfree(bitmap);
}
-EXPORT_SYMBOL(md_bitmap_free);

void md_bitmap_wait_behind_writes(struct mddev *mddev)
{
@@ -2771,6 +2767,7 @@ static struct bitmap_operations bitmap_ops = {
.get_from_slot = bitmap_get_from_slot,
.copy_from_slot = bitmap_copy_from_slot,
.set_pages = bitmap_set_pages,
+ .free = md_bitmap_free,
};

void mddev_set_bitmap_ops(struct mddev *mddev)
diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index d5bbadc1f6fd..d0037665a4dc 100644
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -279,14 +279,13 @@ struct bitmap_operations {
int (*copy_from_slot)(struct mddev *mddev, int slot, sector_t *lo,
sector_t *hi, bool clear_bits);
void (*set_pages)(struct bitmap *bitmap, unsigned long pages);
+ void (*free)(struct bitmap *bitmap);
};

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

/* these are exported */
-
-void md_bitmap_free(struct bitmap *bitmap);
void md_bitmap_wait_behind_writes(struct mddev *mddev);

static inline u64 md_bitmap_events_cleared(struct mddev *mddev)
diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 64a4ccbe68c0..da94f7251da7 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1200,12 +1200,12 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
* can't resize bitmap
*/
goto out;
- md_bitmap_free(bitmap);
+ mddev->bitmap_ops->free(bitmap);
}

return 0;
out:
- md_bitmap_free(bitmap);
+ mddev->bitmap_ops->free(bitmap);
update_bitmap_size(mddev, oldsize);
return -1;
}
@@ -1248,7 +1248,7 @@ static int cluster_check_sync_size(struct mddev *mddev)
bm_lockres = lockres_init(mddev, str, NULL, 1);
if (!bm_lockres) {
pr_err("md-cluster: Cannot initialize %s\n", str);
- md_bitmap_free(bitmap);
+ mddev->bitmap_ops->free(bitmap);
return -1;
}
bm_lockres->flags |= DLM_LKF_NOQUEUE;
@@ -1259,17 +1259,17 @@ static int cluster_check_sync_size(struct mddev *mddev)

rv = mddev->bitmap_ops->get_stats(bitmap, &stats);
if (rv) {
- md_bitmap_free(bitmap);
+ mddev->bitmap_ops->free(bitmap);
return rv;
}

if (sync_size == 0) {
sync_size = stats.sync_size;
} else if (sync_size != stats.sync_size) {
- md_bitmap_free(bitmap);
+ mddev->bitmap_ops->free(bitmap);
return -1;
}
- md_bitmap_free(bitmap);
+ mddev->bitmap_ops->free(bitmap);
}

return (my_sync_size == sync_size) ? 0 : -1;
--
2.39.2