Commit bb9317b1 authored by Yu Kuai's avatar Yu Kuai
Browse files

md/raid5: check before referencing mddev->bitmap_ops 

Prepare to introduce CONFIG_MD_BITMAP.

Link: https://lore.kernel.org/linux-raid/20250707012711.376844-13-yukuai1@huaweicloud.com


Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarXiao Ni <xni@redhat.com>
parent 969f9962

drivers/md/raid5.c

+12 −7
Original line number Diff line number Diff line
@@ -6496,6 +6496,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n 
					   &sync_blocks);

		else /* completed sync */

			conf->fullsync = 0;

		if (md_bitmap_enabled(mddev, false))

			mddev->bitmap_ops->close_sync(mddev);



		return 0;
@@ -6534,6 +6535,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n 
		return sync_blocks * RAID5_STRIPE_SECTORS(conf);

	}



	if (md_bitmap_enabled(mddev, false))

		mddev->bitmap_ops->cond_end_sync(mddev, sector_nr, false);



	sh = raid5_get_active_stripe(conf, NULL, sector_nr,
@@ -6760,6 +6762,7 @@ static void raid5d(struct md_thread *thread) 
			/* Now is a good time to flush some bitmap updates */

			conf->seq_flush++;

			spin_unlock_irq(&conf->device_lock);

			if (md_bitmap_enabled(mddev, true))

				mddev->bitmap_ops->unplug(mddev, true);

			spin_lock_irq(&conf->device_lock);

			conf->seq_write = conf->seq_flush;
@@ -8309,7 +8312,6 @@ 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;
@@ -8319,9 +8321,12 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors) 
	    mddev->array_sectors > newsize)

		return -EINVAL;



	ret = mddev->bitmap_ops->resize(mddev, sectors, 0);

	if (md_bitmap_enabled(mddev, false)) {

		int ret = mddev->bitmap_ops->resize(mddev, sectors, 0);



		if (ret)

			return ret;

	}



	md_set_array_sectors(mddev, newsize);

	if (sectors > mddev->dev_sectors &&