[PATCH RFC -next v2 09/41] md/md-bitmap: add a new helper md_bitmap_set_pages()

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

Currently md-cluster will set bitmap->counts.pages directly, add a
helper to do this to avoid dereferencing bitmap directly.

Noted that after this patch bitmap is not dereferenced directly anymore
and following patches will move the structure inside md-bitmap.c.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
drivers/md/md-bitmap.c | 6 ++++++
drivers/md/md-bitmap.h | 1 +
drivers/md/md-cluster.c | 4 +---
3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 7dcb025207b8..ee3ed1e3daf9 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -2094,6 +2094,12 @@ int md_bitmap_copy_from_slot(struct mddev *mddev, int slot,
}
EXPORT_SYMBOL_GPL(md_bitmap_copy_from_slot);

+void md_bitmap_set_pages(struct bitmap *bitmap, unsigned long pages)
+{
+ bitmap->counts.pages = pages;
+}
+EXPORT_SYMBOL_GPL(md_bitmap_set_pages);
+
int md_bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats)
{
bitmap_super_t *sb;
diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index 119644907f89..cad1de79775f 100644
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -284,6 +284,7 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
struct bitmap *get_bitmap_from_slot(struct mddev *mddev, int slot);
int md_bitmap_copy_from_slot(struct mddev *mddev, int slot,
sector_t *lo, sector_t *hi, bool clear_bits);
+void md_bitmap_set_pages(struct bitmap *bitmap, unsigned long pages);
void md_bitmap_free(struct bitmap *bitmap);
void md_bitmap_wait_behind_writes(struct mddev *mddev);

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index e4ad8efdc63b..1938eadb379b 100644
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -1143,7 +1143,6 @@ static int update_bitmap_size(struct mddev *mddev, sector_t size)

static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsize)
{
- struct bitmap_counts *counts;
struct dlm_lock_resource *bm_lockres;
struct bitmap *bitmap = mddev->bitmap;
struct md_bitmap_stats stats;
@@ -1174,7 +1173,6 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
bitmap = NULL;
goto out;
}
- counts = &bitmap->counts;

rv = md_bitmap_get_stats(bitmap, &stats);
if (rv)
@@ -1192,7 +1190,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
bm_lockres->flags |= DLM_LKF_NOQUEUE;
rv = dlm_lock_sync(bm_lockres, DLM_LOCK_PW);
if (!rv)
- counts->pages = my_pages;
+ md_bitmap_set_pages(bitmap, my_pages);
lockres_free(bm_lockres);

if (my_pages != stats.pages)
--
2.39.2