Skip to content

Commit 4a3aa02

Browse files
committed
md: add helper rdev_needs_recovery()
JIRA: https://issues.redhat.com/browse/RHEL-94433 commit cb0780a Author: Zheng Qixing <zhengqixing@huawei.com> Date: Sat Aug 16 08:25:33 2025 +0800 md: add helper rdev_needs_recovery() Add a helper for checking if an rdev needs recovery. Signed-off-by: Zheng Qixing <zhengqixing@huawei.com> Link: https://lore.kernel.org/linux-raid/20250816002534.1754356-2-zhengqixing@huaweicloud.com Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
1 parent a88af90 commit 4a3aa02

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

drivers/md/md.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4865,6 +4865,15 @@ metadata_store(struct mddev *mddev, const char *buf, size_t len)
48654865
static struct md_sysfs_entry md_metadata =
48664866
__ATTR_PREALLOC(metadata_version, S_IRUGO|S_IWUSR, metadata_show, metadata_store);
48674867

4868+
static bool rdev_needs_recovery(struct md_rdev *rdev, sector_t sectors)
4869+
{
4870+
return rdev->raid_disk >= 0 &&
4871+
!test_bit(Journal, &rdev->flags) &&
4872+
!test_bit(Faulty, &rdev->flags) &&
4873+
!test_bit(In_sync, &rdev->flags) &&
4874+
rdev->recovery_offset < sectors;
4875+
}
4876+
48684877
enum sync_action md_sync_action(struct mddev *mddev)
48694878
{
48704879
unsigned long recovery = mddev->recovery;
@@ -9021,11 +9030,7 @@ static sector_t md_sync_position(struct mddev *mddev, enum sync_action action)
90219030
start = MaxSector;
90229031
rcu_read_lock();
90239032
rdev_for_each_rcu(rdev, mddev)
9024-
if (rdev->raid_disk >= 0 &&
9025-
!test_bit(Journal, &rdev->flags) &&
9026-
!test_bit(Faulty, &rdev->flags) &&
9027-
!test_bit(In_sync, &rdev->flags) &&
9028-
rdev->recovery_offset < start)
9033+
if (rdev_needs_recovery(rdev, start))
90299034
start = rdev->recovery_offset;
90309035
rcu_read_unlock();
90319036

@@ -9384,12 +9389,8 @@ void md_do_sync(struct md_thread *thread)
93849389
test_bit(MD_RECOVERY_RECOVER, &mddev->recovery)) {
93859390
rcu_read_lock();
93869391
rdev_for_each_rcu(rdev, mddev)
9387-
if (rdev->raid_disk >= 0 &&
9388-
mddev->delta_disks >= 0 &&
9389-
!test_bit(Journal, &rdev->flags) &&
9390-
!test_bit(Faulty, &rdev->flags) &&
9391-
!test_bit(In_sync, &rdev->flags) &&
9392-
rdev->recovery_offset < mddev->curr_resync)
9392+
if (mddev->delta_disks >= 0 &&
9393+
rdev_needs_recovery(rdev, mddev->curr_resync))
93939394
rdev->recovery_offset = mddev->curr_resync;
93949395
rcu_read_unlock();
93959396
}

0 commit comments

Comments
 (0)