From 97e2539909d196d6865af8ce01fa7ae58a9a7897 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 10 Mar 2008 11:43:48 -0700
Subject: [PATCH] --- yaml --- r: 87089 b: refs/heads/master c:
 7be3dfec4724c51e890455fe48fe188ad7c18b88 h: refs/heads/master i:   87087:
 f49b2b3af915e715c9410b8aff270e37af3c4673 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/bitmap.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d4e74ee6996..c60a9f5366dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52720ae77d392d3f4c12281c37304edbc8cb51f1
+refs/heads/master: 7be3dfec4724c51e890455fe48fe188ad7c18b88
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 831aed9c56ff..c14dacdacfac 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1045,7 +1045,8 @@ void bitmap_daemon_work(struct bitmap *bitmap)
 	if (bitmap == NULL)
 		return;
 	if (time_before(jiffies, bitmap->daemon_lastrun + bitmap->daemon_sleep*HZ))
-		return;
+		goto done;
+
 	bitmap->daemon_lastrun = jiffies;
 	if (bitmap->allclean) {
 		bitmap->mddev->thread->timeout = MAX_SCHEDULE_TIMEOUT;
@@ -1142,6 +1143,7 @@ void bitmap_daemon_work(struct bitmap *bitmap)
 		}
 	}
 
+ done:
 	if (bitmap->allclean == 0)
 		bitmap->mddev->thread->timeout = bitmap->daemon_sleep * HZ;
 }