md: add helper rdev_needs_recovery()

[ Upstream commit cb0780ad4333040a98e10f014b593ef738a3f31e ]

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>
Stable-dep-of: b7ee30f0efd1 ("md: fix sync_action incorrect display during resync")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 80470bcf43830cd937b84b3ba01eaabd897d8a50..0348b5f3adc59ca3fd95029301ae5e406426475f 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4822,6 +4822,15 @@ out_unlock:
 static struct md_sysfs_entry md_metadata =
 __ATTR_PREALLOC(metadata_version, S_IRUGO|S_IWUSR, metadata_show, metadata_store);
 
+static bool rdev_needs_recovery(struct md_rdev *rdev, sector_t sectors)
+{
+       return rdev->raid_disk >= 0 &&
+              !test_bit(Journal, &rdev->flags) &&
+              !test_bit(Faulty, &rdev->flags) &&
+              !test_bit(In_sync, &rdev->flags) &&
+              rdev->recovery_offset < sectors;
+}
+
 enum sync_action md_sync_action(struct mddev *mddev)
 {
        unsigned long recovery = mddev->recovery;
@@ -8959,11 +8968,7 @@ static sector_t md_sync_position(struct mddev *mddev, enum sync_action action)
                start = MaxSector;
                rcu_read_lock();
                rdev_for_each_rcu(rdev, mddev)
-                       if (rdev->raid_disk >= 0 &&
-                           !test_bit(Journal, &rdev->flags) &&
-                           !test_bit(Faulty, &rdev->flags) &&
-                           !test_bit(In_sync, &rdev->flags) &&
-                           rdev->recovery_offset < start)
+                       if (rdev_needs_recovery(rdev, start))
                                start = rdev->recovery_offset;
                rcu_read_unlock();
 
@@ -9322,12 +9327,8 @@ void md_do_sync(struct md_thread *thread)
                            test_bit(MD_RECOVERY_RECOVER, &mddev->recovery)) {
                                rcu_read_lock();
                                rdev_for_each_rcu(rdev, mddev)
-                                       if (rdev->raid_disk >= 0 &&
-                                           mddev->delta_disks >= 0 &&
-                                           !test_bit(Journal, &rdev->flags) &&
-                                           !test_bit(Faulty, &rdev->flags) &&
-                                           !test_bit(In_sync, &rdev->flags) &&
-                                           rdev->recovery_offset < mddev->curr_resync)
+                                       if (mddev->delta_disks >= 0 &&
+                                           rdev_needs_recovery(rdev, mddev->curr_resync))
                                                rdev->recovery_offset = mddev->curr_resync;
                                rcu_read_unlock();
                        }