md/md-bitmap: pass in mddev directly for md_bitmap_resize()

And move the condition "if (mddev->bitmap)" into md_bitmap_resize() as
well, on the one hand make code cleaner, on the other hand try not to
access bitmap directly.

Since we are here, also change the parameter 'init' from int to bool.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-35-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index c3e201fde4c5d97678c846d5705082a728fbf401..cc071fcd7a046c9ef622ca5a7e9e73d0710f85e2 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -4068,7 +4068,7 @@ static int raid_preresume(struct dm_target *ti)
               mddev->bitmap_info.chunksize != to_bytes(rs->requested_bitmap_chunk_sectors)))) {
                int chunksize = to_bytes(rs->requested_bitmap_chunk_sectors) ?: mddev->bitmap_info.chunksize;
 
-               r = md_bitmap_resize(mddev->bitmap, mddev->dev_sectors, chunksize, 0);
+               r = md_bitmap_resize(mddev, mddev->dev_sectors, chunksize, false);
                if (r)
                        DMERR("Failed to resize bitmap");
        }

diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index efe928849c94b234c44f8d7cb45537dde685c72f..c2292546d6ce183da567803357123315555bf1a7 100644 (file)
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -32,6 +32,9 @@
 #include "md.h"
 #include "md-bitmap.h"
 
+static int __bitmap_resize(struct bitmap *bitmap, sector_t blocks,
+                          int chunksize, bool init);
+
 static inline char *bmname(struct bitmap *bitmap)
 {
        return bitmap->mddev ? mdname(bitmap->mddev) : "mdX";
@@ -1975,7 +1978,8 @@ static struct bitmap *__bitmap_create(struct mddev *mddev, int slot)
                goto error;
 
        bitmap->daemon_lastrun = jiffies;
-       err = md_bitmap_resize(bitmap, blocks, mddev->bitmap_info.chunksize, 1);
+       err = __bitmap_resize(bitmap, blocks, mddev->bitmap_info.chunksize,
+                             true);
        if (err)
                goto error;
 
@@ -2163,8 +2167,8 @@ static int bitmap_get_stats(struct bitmap *bitmap, struct md_bitmap_stats *stats
        return 0;
 }
 
-int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
-                 int chunksize, int init)
+static int __bitmap_resize(struct bitmap *bitmap, sector_t blocks,
+                          int chunksize, bool init)
 {
        /* If chunk_size is 0, choose an appropriate chunk size.
         * Then possibly allocate new storage space.
@@ -2369,6 +2373,17 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
 err:
        return ret;
 }
+
+int md_bitmap_resize(struct mddev *mddev, sector_t blocks, int chunksize,
+                    bool init)
+{
+       struct bitmap *bitmap = mddev->bitmap;
+
+       if (!bitmap)
+               return 0;
+
+       return __bitmap_resize(bitmap, blocks, chunksize, init);
+}
 EXPORT_SYMBOL_GPL(md_bitmap_resize);
 
 static ssize_t

diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index 065b36c0c43af2069b3790f9520c89407c5e6a4e..4610e50548ebf62331627252e898fb7f0f42627c 100644 (file)
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -280,8 +280,8 @@ void mddev_set_bitmap_ops(struct mddev *mddev);
 
 /* these are exported */
 
-int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks,
-                    int chunksize, int init);
+int md_bitmap_resize(struct mddev *mddev, sector_t blocks, int chunksize,
+                    bool init);
 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);

diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c
index 55feabe14ad3ac5111e32b38402fd37f62235254..a7e5ead71c2f911dd81e6950090bbc3f114d59bc 100644 (file)
--- a/drivers/md/md-cluster.c
+++ b/drivers/md/md-cluster.c
@@ -628,8 +628,8 @@ static int process_recvd_msg(struct mddev *mddev, struct cluster_msg *msg)
                break;
        case BITMAP_RESIZE:
                if (le64_to_cpu(msg->high) != mddev->pers->size(mddev, 0, 0))
-                       ret = md_bitmap_resize(mddev->bitmap,
-                                           le64_to_cpu(msg->high), 0, 0);
+                       ret = md_bitmap_resize(mddev, le64_to_cpu(msg->high), 0,
+                                              false);
                break;
        default:
                ret = -1;

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index f9338756088aa40d5fb7dd28ba06aa173ff5902e..cf05bafeae7765dcd42e2fd020d26c30f3db3629 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3297,14 +3297,16 @@ static int raid1_resize(struct mddev *mddev, sector_t sectors)
         * worth it.
         */
        sector_t newsize = raid1_size(mddev, sectors, 0);
+       int ret;
+
        if (mddev->external_size &&
            mddev->array_sectors > newsize)
                return -EINVAL;
-       if (mddev->bitmap) {
-               int ret = md_bitmap_resize(mddev->bitmap, newsize, 0, 0);
-               if (ret)
-                       return ret;
-       }
+
+       ret = md_bitmap_resize(mddev, newsize, 0, false);
+       if (ret)
+               return ret;
+
        md_set_array_sectors(mddev, newsize);
        if (sectors > mddev->dev_sectors &&
            mddev->recovery_cp > mddev->dev_sectors) {

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index c79f374668dde951f82402b543f44e7df494cb9a..4512d285b76ad470896d38d65b17d30bd679d8d7 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -4196,6 +4196,7 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
         */
        struct r10conf *conf = mddev->private;
        sector_t oldsize, size;
+       int ret;
 
        if (mddev->reshape_position != MaxSector)
                return -EBUSY;
@@ -4208,11 +4209,11 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
        if (mddev->external_size &&
            mddev->array_sectors > size)
                return -EINVAL;
-       if (mddev->bitmap) {
-               int ret = md_bitmap_resize(mddev->bitmap, size, 0, 0);
-               if (ret)
-                       return ret;
-       }
+
+       ret = md_bitmap_resize(mddev, size, 0, false);
+       if (ret)
+               return ret;
+
        md_set_array_sectors(mddev, size);
        if (sectors > mddev->dev_sectors &&
            mddev->recovery_cp > oldsize) {
@@ -4478,7 +4479,7 @@ static int raid10_start_reshape(struct mddev *mddev)
                newsize = raid10_size(mddev, 0, conf->geo.raid_disks);
 
                if (!mddev_is_clustered(mddev)) {
-                       ret = md_bitmap_resize(mddev->bitmap, newsize, 0, 0);
+                       ret = md_bitmap_resize(mddev, newsize, 0, false);
                        if (ret)
                                goto abort;
                        else
@@ -4500,13 +4501,13 @@ static int raid10_start_reshape(struct mddev *mddev)
                            MD_FEATURE_RESHAPE_ACTIVE)) || (oldsize == newsize))
                        goto out;
 
-               ret = md_bitmap_resize(mddev->bitmap, newsize, 0, 0);
+               ret = md_bitmap_resize(mddev, newsize, 0, false);
                if (ret)
                        goto abort;
 
                ret = md_cluster_ops->resize_bitmaps(mddev, newsize, oldsize);
                if (ret) {
-                       md_bitmap_resize(mddev->bitmap, oldsize, 0, 0);
+                       md_bitmap_resize(mddev, oldsize, 0, false);
                        goto abort;
                }
        }

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 91b610d11c6a4942954ab3505688e8c8ff72eee3..47c89f7b1dfe8561559eca08af981b1826fe9046 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -8313,6 +8313,7 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors)
         */
        sector_t newsize;
        struct r5conf *conf = mddev->private;
+       int ret;
 
        if (raid5_has_log(conf) || raid5_has_ppl(conf))
                return -EINVAL;
@@ -8321,11 +8322,11 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors)
        if (mddev->external_size &&
            mddev->array_sectors > newsize)
                return -EINVAL;
-       if (mddev->bitmap) {
-               int ret = md_bitmap_resize(mddev->bitmap, sectors, 0, 0);
-               if (ret)
-                       return ret;
-       }
+
+       ret = md_bitmap_resize(mddev, sectors, 0, false);
+       if (ret)
+               return ret;
+
        md_set_array_sectors(mddev, newsize);
        if (sectors > mddev->dev_sectors &&
            mddev->recovery_cp > mddev->dev_sectors) {