From 0575d3b9d8a50a8b94d78e7c0a648b1dadc1c4ab Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 31 Mar 2009 14:27:02 +1100
Subject: [PATCH] --- yaml --- r: 139901 b: refs/heads/master c:
 d0a4bb492772ce5c4bdfba3744a99ed6f6fb238f h: refs/heads/master i:   139899:
 0b3bce7729ece715a9937cffcdafeedc2d535968 v: v3

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

diff --git a/[refs] b/[refs]
index 128daa3d23a2..2be627af5199 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1187cf0a3c8b647d08bc86e043563c8d2a327adc
+refs/heads/master: d0a4bb492772ce5c4bdfba3744a99ed6f6fb238f
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 8fa3277f72dc..2ef497d1848c 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1307,6 +1307,9 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto
 		PRINTK(KERN_DEBUG "dec write-behind count %d/%d\n",
 		  atomic_read(&bitmap->behind_writes), bitmap->max_write_behind);
 	}
+	if (bitmap->mddev->degraded)
+		/* Never clear bits or update events_cleared when degraded */
+		success = 0;
 
 	while (sectors) {
 		int blocks;