Merge tag 'for-6.12/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[J-linux.git] / drivers / md / dm-raid.c

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 32c8240c1873a12a7bec7acd72c67d8cc6b063fa..1e0d3b9b75d6fe54956ca6fa638aef285caae3d9 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3949,7 +3949,9 @@ static int __load_dirty_region_bitmap(struct raid_set *rs)
        /* Try loading the bitmap unless "raid0", which does not have one */
        if (!rs_is_raid0(rs) &&
            !test_and_set_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags)) {
-               r = md_bitmap_load(&rs->md);
+               struct mddev *mddev = &rs->md;
+
+               r = mddev->bitmap_ops->load(mddev);
                if (r)
                        DMERR("Failed to load bitmap");
        }
@@ -4066,7 +4068,8 @@ 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 = mddev->bitmap_ops->resize(mddev, mddev->dev_sectors,
+                                             chunksize, false);
                if (r)
                        DMERR("Failed to resize bitmap");
        }