diff options
-rw-r--r-- | drivers/md/bitmap.c | 1 | ||||
-rw-r--r-- | drivers/md/raid10.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index c1f28a87ea59..b1bcd36ca963 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -1695,6 +1695,7 @@ int bitmap_create(mddev_t *mddev) | |||
1695 | mddev->bitmap = bitmap; | 1695 | mddev->bitmap = bitmap; |
1696 | 1696 | ||
1697 | mddev->thread->timeout = mddev->bitmap_info.daemon_sleep; | 1697 | mddev->thread->timeout = mddev->bitmap_info.daemon_sleep; |
1698 | md_wakeup_thread(mddev->thread); | ||
1698 | 1699 | ||
1699 | bitmap_update_sb(bitmap); | 1700 | bitmap_update_sb(bitmap); |
1700 | 1701 | ||
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 064c2bb5ee63..d9e28a65af58 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
@@ -2275,13 +2275,6 @@ static void raid10_quiesce(mddev_t *mddev, int state) | |||
2275 | lower_barrier(conf); | 2275 | lower_barrier(conf); |
2276 | break; | 2276 | break; |
2277 | } | 2277 | } |
2278 | if (mddev->thread) { | ||
2279 | if (mddev->bitmap) | ||
2280 | mddev->thread->timeout = mddev->bitmap_info.daemon_sleep; | ||
2281 | else | ||
2282 | mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT; | ||
2283 | md_wakeup_thread(mddev->thread); | ||
2284 | } | ||
2285 | } | 2278 | } |
2286 | 2279 | ||
2287 | static struct mdk_personality raid10_personality = | 2280 | static struct mdk_personality raid10_personality = |