---

yaml
---
r: 276983
b: refs/heads/master
c: 30d7a48
h: refs/heads/master
i:
  276981: 0d226c1
  276979: 1aaefaf
  276975: de73fd4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09cd9270ea52e0f9851528e8ed028073f96b3c34
+refs/heads/master: 30d7a4836847bdb10b32c78a4879d4aebe0f193b

trunk/drivers/md/raid5.c

@@ -3065,11 +3065,17 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
 			}
 		} else if (test_bit(In_sync, &rdev->flags))
 			set_bit(R5_Insync, &dev->flags);
-		else {
+		else if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
 			/* in sync if before recovery_offset */
-			if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
-				set_bit(R5_Insync, &dev->flags);
-		}
+			set_bit(R5_Insync, &dev->flags);
+		else if (test_bit(R5_UPTODATE, &dev->flags) &&
+			 test_bit(R5_Expanded, &dev->flags))
+			/* If we've reshaped into here, we assume it is Insync.
+			 * We will shortly update recovery_offset to make
+			 * it official.
+			 */
+			set_bit(R5_Insync, &dev->flags);
+
 		if (rdev && test_bit(R5_WriteError, &dev->flags)) {
 			clear_bit(R5_Insync, &dev->flags);
 			if (!test_bit(Faulty, &rdev->flags)) {