bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

md/md-bitmap: handle the case bitmap is not enabled before start_sync()

Browse Source 
This case can be handled without knowing internal implementation.

Prepare to introduce CONFIG_MD_BITMAP.

Link: https://lore.kernel.org/linux-raid/20250707012711.376844-8-yukuai1@huaweicloud.com
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Xiao Ni <xni@redhat.com>
This commit is contained in:
Yu Kuai
2025-07-07 09:27:03 +08:00
parent 110332074d
commit 5ae58d1500
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/md/raid10.c
View File

@@ -3351,9 +3351,8 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
* we only need to recover the block if it is set in
* the bitmap
*/
must_sync = mddev->bitmap_ops->start_sync(mddev, sect,
&sync_blocks,
true);
must_sync = md_bitmap_start_sync(mddev, sect,
&sync_blocks, true);
if (sync_blocks < max_sync)
max_sync = sync_blocks;
if (!must_sync &&
@@ -3396,9 +3395,8 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
}
}
must_sync = mddev->bitmap_ops->start_sync(mddev, sect,
&sync_blocks, still_degraded);
md_bitmap_start_sync(mddev, sect, &sync_blocks,
still_degraded);
any_working = 0;
for (j=0; j<conf->copies;j++) {
int k;
@@ -3574,9 +3572,8 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,
mddev_is_clustered(mddev) &&
(sector_nr + 2 * RESYNC_SECTORS > conf->cluster_sync_high));
if (!mddev->bitmap_ops->start_sync(mddev, sector_nr,
&sync_blocks,
mddev->degraded) &&
if (!md_bitmap_start_sync(mddev, sector_nr, &sync_blocks,
mddev->degraded) &&
!conf->fullsync && !test_bit(MD_RECOVERY_REQUESTED,
&mddev->recovery)) {
/* We can skip this block */