Commit 3199a34b authored by Benjamin Marzinski's avatar Benjamin Marzinski Committed by Mikulas Patocka
Browse files

dm-raid: Fix WARN_ON_ONCE check for sync_thread in raid_resume 



rm-raid devices will occasionally trigger the following warning when
being resumed after a table load because DM_RECOVERY_RUNNING is set:

WARNING: CPU: 7 PID: 5660 at drivers/md/dm-raid.c:4105 raid_resume+0xee/0x100 [dm_raid]

The failing check is:
WARN_ON_ONCE(test_bit(MD_RECOVERY_RUNNING, &mddev->recovery));

This check is designed to make sure that the sync thread isn't
registered, but md_check_recovery can set MD_RECOVERY_RUNNING without
the sync_thread ever getting registered. Instead of checking if
MD_RECOVERY_RUNNING is set, check if sync_thread is non-NULL.

Fixes: 16c4770c ("dm-raid: really frozen sync_thread during suspend")
Suggested-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarBenjamin Marzinski <bmarzins@redhat.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
parent b76ad884

drivers/md/dm-raid.c

+3 −2
Original line number Diff line number Diff line
@@ -4101,10 +4101,11 @@ static void raid_resume(struct dm_target *ti) 
		if (mddev->delta_disks < 0)

			rs_set_capacity(rs);



		mddev_lock_nointr(mddev);

		WARN_ON_ONCE(!test_bit(MD_RECOVERY_FROZEN, &mddev->recovery));

		WARN_ON_ONCE(test_bit(MD_RECOVERY_RUNNING, &mddev->recovery));

		WARN_ON_ONCE(rcu_dereference_protected(mddev->sync_thread,

						       lockdep_is_held(&mddev->reconfig_mutex)));

		clear_bit(RT_FLAG_RS_FROZEN, &rs->runtime_flags);

		mddev_lock_nointr(mddev);

		mddev->ro = 0;

		mddev->in_sync = 0;

		md_unfrozen_sync_thread(mddev);