From 58d108bc3f0efd68e0f30afe936cee4ed67f2fd0 Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Mon, 2 Apr 2012 01:16:59 +1000
Subject: [PATCH] --- yaml --- r: 298551 b: refs/heads/master c:
 c6d2e084c7411f61f2b446d94989e5aaf9879b0f h: refs/heads/master i:   298549:
 892dda9208a397609c1951f10e89c9459aa72d06   298547:
 acb8aade9a64f7eeb9b855cf3e4c4d5c91318fa8   298543:
 a474db047848f3b5960c3c0519955f28fe1df5b0 v: v3

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

diff --git a/[refs] b/[refs]
index a1b2adf554a4..d2d7c690b21b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a42f9d83b5c05dc6e678a1f0cd9767502c2c58de
+refs/heads/master: c6d2e084c7411f61f2b446d94989e5aaf9879b0f
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 9799be80bf31..f351422938e0 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -3279,12 +3279,14 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
 		/* If there is a failed device being replaced,
 		 *     we must be recovering.
 		 * else if we are after recovery_cp, we must be syncing
+		 * else if MD_RECOVERY_REQUESTED is set, we also are syncing.
 		 * else we can only be replacing
 		 * sync and recovery both need to read all devices, and so
 		 * use the same flag.
 		 */
 		if (do_recovery ||
-		    sh->sector >= conf->mddev->recovery_cp)
+		    sh->sector >= conf->mddev->recovery_cp ||
+		    test_bit(MD_RECOVERY_REQUESTED, &(conf->mddev->recovery)))
 			s->syncing = 1;
 		else
 			s->replacing = 1;