[PATCH v5 13/15] md/dm-raid: check before referencing mddev->bitmap_ops

[Yu Kuai]

From: Yu Kuai <yuku...@huawei.com>

Prepare to introduce CONFIG_MD_BITMAP.

Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
 drivers/md/dm-raid.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 9757c32ea1f5..f11b4e1d9b75 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -3950,9 +3950,11 @@ static int __load_dirty_region_bitmap(struct raid_set 
*rs)
            !test_and_set_bit(RT_FLAG_RS_BITMAP_LOADED, &rs->runtime_flags)) {
                struct mddev *mddev = &rs->md;
 
-               r = mddev->bitmap_ops->load(mddev);
-               if (r)
-                       DMERR("Failed to load bitmap");
+               if (md_bitmap_enabled(mddev, false)) {
+                       r = mddev->bitmap_ops->load(mddev);
+                       if (r)
+                               DMERR("Failed to load bitmap");
+               }
        }
 
        return r;
@@ -4067,10 +4069,12 @@ 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 = mddev->bitmap_ops->resize(mddev, mddev->dev_sectors,
-                                             chunksize);
-               if (r)
-                       DMERR("Failed to resize bitmap");
+               if (md_bitmap_enabled(mddev, false)) {
+                       r = mddev->bitmap_ops->resize(mddev, mddev->dev_sectors,
+                                                     chunksize);
+                       if (r)
+                               DMERR("Failed to resize bitmap");
+               }
        }
 
        /* Check for any resize/reshape on @rs and adjust/initiate */
-- 
2.39.2