diff options
| author |   NeilBrown <neilb@suse.de> | 2009-12-14 12:49:54 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-12-14 12:51:41 +1100 |
| commit | 9cd30fdc33cde9ae4ac55a1ccbbb89f3f7b9b2f2 (patch) | |
| tree | b6a4e0303fe3261892f24f26d7ecebf06a6be1a9 /drivers/md | |
| parent | md: change daemon_sleep to be in 'jiffies' rather than 'seconds'. (diff) | |
| download | linux-dev-9cd30fdc33cde9ae4ac55a1ccbbb89f3f7b9b2f2.tar.xz linux-dev-9cd30fdc33cde9ae4ac55a1ccbbb89f3f7b9b2f2.zip | |
md: remove needless setting of thread->timeout in raid10_quiesce
As bitmap_create and bitmap_destroy already set thread->timeout
as appropriate, there is no need to do it in raid10_quiesce.
There is a possible need to wake the thread after the timeout
has been set low, but it is better to do that where the timeout
is actually set low, in bitmap_create.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -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) mddev->bitmap = bitmap; mddev->thread->timeout = mddev->bitmap_info.daemon_sleep; + md_wakeup_thread(mddev->thread); bitmap_update_sb(bitmap); 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) 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 = |