---

yaml --- r: 298551 b: refs/heads/master c: c6d2e08 h: refs/heads/master i: 298549: 892dda9 298547: acb8aad 298543: a474db0 v: v3
git-mirror · Apr 3, 2012 · 58d108b · 58d108b
1 parent 36a73de
commit 58d108b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;