2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 73a068da10d9..ea2d90c78f78 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -1252,9 +1252,9 @@ static void raid_resume(struct dm_target *ti)
         if (!rs->bitmap_loaded) {
                 bitmap_load(&rs->md);
                 rs->bitmap_loaded = 1;
-        } else
-                md_wakeup_thread(rs->md.thread);
+        }
 
+        clear_bit(MD_RECOVERY_FROZEN, &rs->md.recovery);
         mddev_resume(&rs->md);
 }
 
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 86adf4ac46cf..4c9836885d3e 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -402,6 +402,7 @@ void mddev_resume(struct mddev *mddev)
         wake_up(&mddev->sb_wait);
         mddev->pers->quiesce(mddev, 0);
 
+        set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
         md_wakeup_thread(mddev->thread);
         md_wakeup_thread(mddev->sync_thread); /* possibly kick off a reshape */
 }
@@ -3673,10 +3674,8 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
                 del_timer_sync(&mddev->safemode_timer);
         }
         pers->run(mddev);
-        mddev_resume(mddev);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
-        md_wakeup_thread(mddev->thread);
+        mddev_resume(mddev);
         sysfs_notify(&mddev->kobj, NULL, "level");
         md_new_event(mddev);
         return rv;