aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-raid.c4
-rw-r--r--drivers/md/md.c5
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)
1252 if (!rs->bitmap_loaded) { 1252 if (!rs->bitmap_loaded) {
1253 bitmap_load(&rs->md); 1253 bitmap_load(&rs->md);
1254 rs->bitmap_loaded = 1; 1254 rs->bitmap_loaded = 1;
1255 } else 1255 }
1256 md_wakeup_thread(rs->md.thread);
1257 1256
1257 clear_bit(MD_RECOVERY_FROZEN, &rs->md.recovery);
1258 mddev_resume(&rs->md); 1258 mddev_resume(&rs->md);
1259} 1259}
1260 1260
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)
402 wake_up(&mddev->sb_wait); 402 wake_up(&mddev->sb_wait);
403 mddev->pers->quiesce(mddev, 0); 403 mddev->pers->quiesce(mddev, 0);
404 404
405 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
405 md_wakeup_thread(mddev->thread); 406 md_wakeup_thread(mddev->thread);
406 md_wakeup_thread(mddev->sync_thread); /* possibly kick off a reshape */ 407 md_wakeup_thread(mddev->sync_thread); /* possibly kick off a reshape */
407} 408}
@@ -3673,10 +3674,8 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
3673 del_timer_sync(&mddev->safemode_timer); 3674 del_timer_sync(&mddev->safemode_timer);
3674 } 3675 }
3675 pers->run(mddev); 3676 pers->run(mddev);
3676 mddev_resume(mddev);
3677 set_bit(MD_CHANGE_DEVS, &mddev->flags); 3677 set_bit(MD_CHANGE_DEVS, &mddev->flags);
3678 set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); 3678 mddev_resume(mddev);
3679 md_wakeup_thread(mddev->thread);
3680 sysfs_notify(&mddev->kobj, NULL, "level"); 3679 sysfs_notify(&mddev->kobj, NULL, "level");
3681 md_new_event(mddev); 3680 md_new_event(mddev);
3682 return rv; 3681 return rv;