Commit cb0780ad authored by Zheng Qixing's avatar Zheng Qixing Committed by Yu Kuai
Browse files

md: add helper rdev_needs_recovery() 



Add a helper for checking if an rdev needs recovery.

Signed-off-by: default avatarZheng Qixing <zhengqixing@huawei.com>
Link: https://lore.kernel.org/linux-raid/20250816002534.1754356-2-zhengqixing@huaweicloud.com


Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
parent c2797321

drivers/md/md.c

+12 −11
Original line number Diff line number Diff line
@@ -4839,6 +4839,15 @@ metadata_store(struct mddev *mddev, const char *buf, size_t len) 
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;
@@ -8995,11 +9004,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();
@@ -9358,12 +9363,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();

			}