Skip to content

Commit 44e72b7

Browse files
committed
md/raid10: check before referencing mddev->bitmap_ops
JIRA: https://issues.redhat.com/browse/RHEL-123668 commit 969f996 Author: Yu Kuai <yukuai3@huawei.com> Date: Mon Jul 7 09:27:07 2025 +0800 md/raid10: check before referencing mddev->bitmap_ops Prepare to introduce CONFIG_MD_BITMAP. Link: https://lore.kernel.org/linux-raid/20250707012711.376844-12-yukuai1@huaweicloud.com Signed-off-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Xiao Ni <xni@redhat.com> Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
1 parent 76cd267 commit 44e72b7

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

drivers/md/raid10.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3247,7 +3247,8 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
32473247
}
32483248
conf->fullsync = 0;
32493249
}
3250-
mddev->bitmap_ops->close_sync(mddev);
3250+
if (md_bitmap_enabled(mddev, false))
3251+
mddev->bitmap_ops->close_sync(mddev);
32513252
close_sync(conf);
32523253
*skipped = 1;
32533254
return sectors_skipped;
@@ -3566,7 +3567,8 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
35663567
* safety reason, which ensures curr_resync_completed is
35673568
* updated in bitmap_cond_end_sync.
35683569
*/
3569-
mddev->bitmap_ops->cond_end_sync(mddev, sector_nr,
3570+
if (md_bitmap_enabled(mddev, false))
3571+
mddev->bitmap_ops->cond_end_sync(mddev, sector_nr,
35703572
mddev_is_clustered(mddev) &&
35713573
(sector_nr + 2 * RESYNC_SECTORS > conf->cluster_sync_high));
35723574

@@ -4220,7 +4222,6 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
42204222
*/
42214223
struct r10conf *conf = mddev->private;
42224224
sector_t oldsize, size;
4223-
int ret;
42244225

42254226
if (mddev->reshape_position != MaxSector)
42264227
return -EBUSY;
@@ -4234,9 +4235,12 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors)
42344235
mddev->array_sectors > size)
42354236
return -EINVAL;
42364237

4237-
ret = mddev->bitmap_ops->resize(mddev, size, 0);
4238-
if (ret)
4239-
return ret;
4238+
if (md_bitmap_enabled(mddev, false)) {
4239+
int ret = mddev->bitmap_ops->resize(mddev, size, 0);
4240+
4241+
if (ret)
4242+
return ret;
4243+
}
42404244

42414245
md_set_array_sectors(mddev, size);
42424246
if (sectors > mddev->dev_sectors &&
@@ -4502,7 +4506,8 @@ static int raid10_start_reshape(struct mddev *mddev)
45024506
oldsize = raid10_size(mddev, 0, 0);
45034507
newsize = raid10_size(mddev, 0, conf->geo.raid_disks);
45044508

4505-
if (!mddev_is_clustered(mddev)) {
4509+
if (!mddev_is_clustered(mddev) &&
4510+
md_bitmap_enabled(mddev, false)) {
45064511
ret = mddev->bitmap_ops->resize(mddev, newsize, 0);
45074512
if (ret)
45084513
goto abort;
@@ -4525,6 +4530,7 @@ static int raid10_start_reshape(struct mddev *mddev)
45254530
MD_FEATURE_RESHAPE_ACTIVE)) || (oldsize == newsize))
45264531
goto out;
45274532

4533+
/* cluster can't be setup without bitmap */
45284534
ret = mddev->bitmap_ops->resize(mddev, newsize, 0);
45294535
if (ret)
45304536
goto abort;

0 commit comments

Comments
 (0)