Commit ef1c400f authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu

md/md-bitmap: merge md_bitmap_set_pages() into struct bitmap_operations

o that the implementation won't be exposed, and it'll be possible
o invent a new bitmap by replacing bitmap_operations.
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-39-yukuai1@huaweicloud.comSigned-off-by: default avatarSong Liu <song@kernel.org>
parent 3dd9141a
...@@ -2132,11 +2132,10 @@ static int bitmap_copy_from_slot(struct mddev *mddev, int slot, sector_t *low, ...@@ -2132,11 +2132,10 @@ static int bitmap_copy_from_slot(struct mddev *mddev, int slot, sector_t *low,
return rv; return rv;
} }
void md_bitmap_set_pages(struct bitmap *bitmap, unsigned long pages) static void bitmap_set_pages(struct bitmap *bitmap, unsigned long pages)
{ {
bitmap->counts.pages = pages; bitmap->counts.pages = pages;
} }
EXPORT_SYMBOL_GPL(md_bitmap_set_pages);
static int bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats) static int bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats)
{ {
...@@ -2782,6 +2781,7 @@ static struct bitmap_operations bitmap_ops = { ...@@ -2782,6 +2781,7 @@ static struct bitmap_operations bitmap_ops = {
.sync_with_cluster = bitmap_sync_with_cluster, .sync_with_cluster = bitmap_sync_with_cluster,
.get_from_slot = bitmap_get_from_slot, .get_from_slot = bitmap_get_from_slot,
.copy_from_slot = bitmap_copy_from_slot, .copy_from_slot = bitmap_copy_from_slot,
.set_pages = bitmap_set_pages,
}; };
void mddev_set_bitmap_ops(struct mddev *mddev) void mddev_set_bitmap_ops(struct mddev *mddev)
......
...@@ -279,6 +279,7 @@ struct bitmap_operations { ...@@ -279,6 +279,7 @@ struct bitmap_operations {
struct bitmap *(*get_from_slot)(struct mddev *mddev, int slot); struct bitmap *(*get_from_slot)(struct mddev *mddev, int slot);
int (*copy_from_slot)(struct mddev *mddev, int slot, sector_t *lo, int (*copy_from_slot)(struct mddev *mddev, int slot, sector_t *lo,
sector_t *hi, bool clear_bits); sector_t *hi, bool clear_bits);
void (*set_pages)(struct bitmap *bitmap, unsigned long pages);
}; };
/* the bitmap API */ /* the bitmap API */
...@@ -286,7 +287,6 @@ void mddev_set_bitmap_ops(struct mddev *mddev); ...@@ -286,7 +287,6 @@ void mddev_set_bitmap_ops(struct mddev *mddev);
/* these are exported */ /* these are exported */
void md_bitmap_set_pages(struct bitmap *bitmap, unsigned long pages);
void md_bitmap_free(struct bitmap *bitmap); void md_bitmap_free(struct bitmap *bitmap);
void md_bitmap_wait_behind_writes(struct mddev *mddev); void md_bitmap_wait_behind_writes(struct mddev *mddev);
......
...@@ -1192,7 +1192,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz ...@@ -1192,7 +1192,7 @@ static int resize_bitmaps(struct mddev *mddev, sector_t newsize, sector_t oldsiz
bm_lockres->flags |= DLM_LKF_NOQUEUE; bm_lockres->flags |= DLM_LKF_NOQUEUE;
rv = dlm_lock_sync(bm_lockres, DLM_LOCK_PW); rv = dlm_lock_sync(bm_lockres, DLM_LOCK_PW);
if (!rv) if (!rv)
md_bitmap_set_pages(bitmap, my_pages); mddev->bitmap_ops->set_pages(bitmap, my_pages);
lockres_free(bm_lockres); lockres_free(bm_lockres);
if (my_pages != stats.pages) if (my_pages != stats.pages)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment