Commit 2d3b130e authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu

md/md-bitmap: merge md_bitmap_dirty_bits() 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.

Also change the parameter from bitmap to mddev, to avoid access
bitmap outside md-bitmap.c as much as possible.

And while we're here, also fix coding style for bitmap_store().
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-23-yukuai1@huaweicloud.comSigned-off-by: default avatarSong Liu <song@kernel.org>
parent b26313cb
...@@ -1753,12 +1753,18 @@ static void md_bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset, in ...@@ -1753,12 +1753,18 @@ static void md_bitmap_set_memory_bits(struct bitmap *bitmap, sector_t offset, in
} }
/* dirty the memory and file bits for bitmap chunks "s" to "e" */ /* dirty the memory and file bits for bitmap chunks "s" to "e" */
void md_bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e) static void bitmap_dirty_bits(struct mddev *mddev, unsigned long s,
unsigned long e)
{ {
unsigned long chunk; unsigned long chunk;
struct bitmap *bitmap = mddev->bitmap;
if (!bitmap)
return;
for (chunk = s; chunk <= e; chunk++) { for (chunk = s; chunk <= e; chunk++) {
sector_t sec = (sector_t)chunk << bitmap->counts.chunkshift; sector_t sec = (sector_t)chunk << bitmap->counts.chunkshift;
md_bitmap_set_memory_bits(bitmap, sec, 1); md_bitmap_set_memory_bits(bitmap, sec, 1);
md_bitmap_file_set_bit(bitmap, sec); md_bitmap_file_set_bit(bitmap, sec);
if (sec < bitmap->mddev->recovery_cp) if (sec < bitmap->mddev->recovery_cp)
...@@ -2720,6 +2726,7 @@ static struct bitmap_operations bitmap_ops = { ...@@ -2720,6 +2726,7 @@ static struct bitmap_operations bitmap_ops = {
.destroy = bitmap_destroy, .destroy = bitmap_destroy,
.flush = bitmap_flush, .flush = bitmap_flush,
.write_all = bitmap_write_all, .write_all = bitmap_write_all,
.dirty_bits = bitmap_dirty_bits,
.update_sb = bitmap_update_sb, .update_sb = bitmap_update_sb,
.get_stats = bitmap_get_stats, .get_stats = bitmap_get_stats,
......
...@@ -252,6 +252,8 @@ struct bitmap_operations { ...@@ -252,6 +252,8 @@ struct bitmap_operations {
void (*destroy)(struct mddev *mddev); void (*destroy)(struct mddev *mddev);
void (*flush)(struct mddev *mddev); void (*flush)(struct mddev *mddev);
void (*write_all)(struct mddev *mddev); void (*write_all)(struct mddev *mddev);
void (*dirty_bits)(struct mddev *mddev, unsigned long s,
unsigned long e);
void (*update_sb)(struct bitmap *bitmap); void (*update_sb)(struct bitmap *bitmap);
int (*get_stats)(struct bitmap *bitmap, struct md_bitmap_stats *stats); int (*get_stats)(struct bitmap *bitmap, struct md_bitmap_stats *stats);
...@@ -260,10 +262,6 @@ struct bitmap_operations { ...@@ -260,10 +262,6 @@ struct bitmap_operations {
/* the bitmap API */ /* the bitmap API */
void mddev_set_bitmap_ops(struct mddev *mddev); void mddev_set_bitmap_ops(struct mddev *mddev);
/* these are used only by md/bitmap */
void md_bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e);
/* these are exported */ /* these are exported */
int md_bitmap_startwrite(struct bitmap *bitmap, sector_t offset, int md_bitmap_startwrite(struct bitmap *bitmap, sector_t offset,
unsigned long sectors, int behind); unsigned long sectors, int behind);
......
...@@ -4699,14 +4699,20 @@ bitmap_store(struct mddev *mddev, const char *buf, size_t len) ...@@ -4699,14 +4699,20 @@ bitmap_store(struct mddev *mddev, const char *buf, size_t len)
/* buf should be <chunk> <chunk> ... or <chunk>-<chunk> ... (range) */ /* buf should be <chunk> <chunk> ... or <chunk>-<chunk> ... (range) */
while (*buf) { while (*buf) {
chunk = end_chunk = simple_strtoul(buf, &end, 0); chunk = end_chunk = simple_strtoul(buf, &end, 0);
if (buf == end) break; if (buf == end)
break;
if (*end == '-') { /* range */ if (*end == '-') { /* range */
buf = end + 1; buf = end + 1;
end_chunk = simple_strtoul(buf, &end, 0); end_chunk = simple_strtoul(buf, &end, 0);
if (buf == end) break; if (buf == end)
break;
} }
if (*end && !isspace(*end)) break;
md_bitmap_dirty_bits(mddev->bitmap, chunk, end_chunk); if (*end && !isspace(*end))
break;
mddev->bitmap_ops->dirty_bits(mddev, chunk, end_chunk);
buf = skip_spaces(end); buf = skip_spaces(end);
} }
md_bitmap_unplug(mddev->bitmap); /* flush the bits to disk */ md_bitmap_unplug(mddev->bitmap); /* flush the bits to disk */
......
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