From 95f6dbcb1af484da8ef30ab91213214e88379641 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 23 Dec 2011 09:57:48 +1100
Subject: [PATCH] --- yaml --- r: 276985 b: refs/heads/master c:
 961902c0f8240175729274cd14198872f42072b7 h: refs/heads/master i:   276983:
 53f916e056f82a34c4d45cfe47ddfcce8b0bf5a9 v: v3

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

diff --git a/[refs] b/[refs]
index 72bab546e6bb..d82691118c0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60fc13702a1b35118c1548e9c257fa038cecb658
+refs/heads/master: 961902c0f8240175729274cd14198872f42072b7
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index b6907118283a..6d03774b176e 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1393,9 +1393,6 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto
 			 atomic_read(&bitmap->behind_writes),
 			 bitmap->mddev->bitmap_info.max_write_behind);
 	}
-	if (bitmap->mddev->degraded)
-		/* Never clear bits or update events_cleared when degraded */
-		success = 0;
 
 	while (sectors) {
 		sector_t blocks;
@@ -1409,7 +1406,7 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto
 			return;
 		}
 
-		if (success &&
+		if (success && !bitmap->mddev->degraded &&
 		    bitmap->events_cleared < bitmap->mddev->events) {
 			bitmap->events_cleared = bitmap->mddev->events;
 			bitmap->need_sync = 1;