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: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-23-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 47d074bf292d22c36781169c8b48d3b7f0ba5ecd..6448f78d50c2f8f5634c88abc5c407fb55bc16b6 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -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" */
-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;
+       struct bitmap *bitmap = mddev->bitmap;
+
+       if (!bitmap)
+               return;
 
        for (chunk = s; chunk <= e; chunk++) {
                sector_t sec = (sector_t)chunk << bitmap->counts.chunkshift;
+
                md_bitmap_set_memory_bits(bitmap, sec, 1);
                md_bitmap_file_set_bit(bitmap, sec);
                if (sec < bitmap->mddev->recovery_cp)
@@ -2720,6 +2726,7 @@ static struct bitmap_operations bitmap_ops = {
        .destroy                = bitmap_destroy,
        .flush                  = bitmap_flush,
        .write_all              = bitmap_write_all,
+       .dirty_bits             = bitmap_dirty_bits,
 
        .update_sb              = bitmap_update_sb,
        .get_stats              = bitmap_get_stats,

diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index 89cd60a7bb071f13c8d9ba733616182a687c2071..875ecbb5b1e4993797f984ad83b7bf5b4add1b2d 100644 (file)
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -252,6 +252,8 @@ struct bitmap_operations {
        void (*destroy)(struct mddev *mddev);
        void (*flush)(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);
        int (*get_stats)(struct bitmap *bitmap, struct md_bitmap_stats *stats);
@@ -260,10 +262,6 @@ struct bitmap_operations {
 /* the bitmap API */
 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 */
 int md_bitmap_startwrite(struct bitmap *bitmap, sector_t offset,
                         unsigned long sectors, int behind);

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1dc800113b7bb3d3c81b72078ae522f0f640a8c2..f72fa8e872f81127c07744bbe9ff00d5c0422218 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4699,14 +4699,20 @@ bitmap_store(struct mddev *mddev, const char *buf, size_t len)
        /* buf should be <chunk> <chunk> ... or <chunk>-<chunk> ... (range) */
        while (*buf) {
                chunk = end_chunk = simple_strtoul(buf, &end, 0);
-               if (buf == end) break;
+               if (buf == end)
+                       break;
+
                if (*end == '-') { /* range */
                        buf = end + 1;
                        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);
        }
        md_bitmap_unplug(mddev->bitmap); /* flush the bits to disk */