From b88f125e7cb3ed82e548318094c911270077be92 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 14 Dec 2009 12:49:56 +1100
Subject: [PATCH] --- yaml --- r: 176093 b: refs/heads/master c:
 ffa23322b1596bb1a115e767d4251b62842adc23 h: refs/heads/master i:   176091:
 837834627e0c98f8bbcfcc9341ae37937fc2295e v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/bitmap.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea457aef3d7b..4764e6689d7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ece5cff0da9e696c360fff592cb5f51b6419e4d6
+refs/heads/master: ffa23322b1596bb1a115e767d4251b62842adc23
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index de5c42df8d17..26ac8aad0b19 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1566,6 +1566,12 @@ void bitmap_dirty_bits(struct bitmap *bitmap, unsigned long s, unsigned long e)
 		sector_t sec = (sector_t)chunk << CHUNK_BLOCK_SHIFT(bitmap);
 		bitmap_set_memory_bits(bitmap, sec, 1);
 		bitmap_file_set_bit(bitmap, sec);
+		if (sec < bitmap->mddev->recovery_cp)
+			/* We are asserting that the array is dirty,
+			 * so move the recovery_cp address back so
+			 * that it is obvious that it is dirty
+			 */
+			bitmap->mddev->recovery_cp = sec;
 	}
 }