Skip to content

Commit 3199a34

Browse files
bmarzinsMikulas Patocka
authored andcommitted
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: 16c4770 ("dm-raid: really frozen sync_thread during suspend") Suggested-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> Reviewed-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
1 parent b76ad88 commit 3199a34

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/md/dm-raid.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4101,10 +4101,11 @@ static void raid_resume(struct dm_target *ti)
41014101
if (mddev->delta_disks < 0)
41024102
rs_set_capacity(rs);
41034103

4104+
mddev_lock_nointr(mddev);
41044105
WARN_ON_ONCE(!test_bit(MD_RECOVERY_FROZEN, &mddev->recovery));
4105-
WARN_ON_ONCE(test_bit(MD_RECOVERY_RUNNING, &mddev->recovery));
4106+
WARN_ON_ONCE(rcu_dereference_protected(mddev->sync_thread,
4107+
lockdep_is_held(&mddev->reconfig_mutex)));
41064108
clear_bit(RT_FLAG_RS_FROZEN, &rs->runtime_flags);
4107-
mddev_lock_nointr(mddev);
41084109
mddev->ro = 0;
41094110
mddev->in_sync = 0;
41104111
md_unfrozen_sync_thread(mddev);

0 commit comments

Comments
 (0)