From 61b86859cbcd250d3784db4b0c38626c162fc5ec Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 14 Dec 2009 12:49:54 +1100 Subject: [PATCH] --- yaml --- r: 176087 b: refs/heads/master c: 9cd30fdc33cde9ae4ac55a1ccbbb89f3f7b9b2f2 h: refs/heads/master i: 176085: 1a8e6ecf6229abd7427579666494119d8e2f71e1 176083: f5a6d1c3dbf5a996e9ff12eec4d42747afbf51ef 176079: 8161e603db26733a294ec9c289d4835b72fa310a v: v3 --- [refs] | 2 +- trunk/drivers/md/bitmap.c | 1 + trunk/drivers/md/raid10.c | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9071642cbab2..17da8e53de8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b04be96f6910ee415287bf0d5309c7d4c94bd2b +refs/heads/master: 9cd30fdc33cde9ae4ac55a1ccbbb89f3f7b9b2f2 diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c index c1f28a87ea59..b1bcd36ca963 100644 --- a/trunk/drivers/md/bitmap.c +++ b/trunk/drivers/md/bitmap.c @@ -1695,6 +1695,7 @@ int bitmap_create(mddev_t *mddev) mddev->bitmap = bitmap; mddev->thread->timeout = mddev->bitmap_info.daemon_sleep; + md_wakeup_thread(mddev->thread); bitmap_update_sb(bitmap); diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index 064c2bb5ee63..d9e28a65af58 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -2275,13 +2275,6 @@ static void raid10_quiesce(mddev_t *mddev, int state) lower_barrier(conf); break; } - if (mddev->thread) { - if (mddev->bitmap) - mddev->thread->timeout = mddev->bitmap_info.daemon_sleep; - else - mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT; - md_wakeup_thread(mddev->thread); - } } static struct mdk_personality raid10_personality =