---

yaml --- r: 176087 b: refs/heads/master c: 9cd30fd h: refs/heads/master i: 176085: 1a8e6ec 176083: f5a6d1c 176079: 8161e60 v: v3
git-mirror · Dec 14, 2009 · 61b8685 · 61b8685
1 parent 453edf1
commit 61b8685
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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 =