From 80ffeb095e9826cb9b59605573d5ebafd34a4e73 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 22 May 2012 13:55:33 +1000
Subject: [PATCH] --- yaml --- r: 305965 b: refs/heads/master c:
 da7613b8b042ab1d3ea55459ed97301e4a2097bb h: refs/heads/master i:   305963:
 e16eeacf40732b7bbc74a781f46f2f92c37c3cde v: v3

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

diff --git a/[refs] b/[refs]
index d90fa986fe84..921ef6334799 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c098220e2320c1f0c9339d0ff05c5e04672133a
+refs/heads/master: da7613b8b042ab1d3ea55459ed97301e4a2097bb
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 8fba57e8f78b..d26767246d26 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -5755,11 +5755,11 @@ static void raid5_finish_reshape(struct mddev *mddev)
 			     d < conf->raid_disks - mddev->delta_disks;
 			     d++) {
 				struct md_rdev *rdev = conf->disks[d].rdev;
-				if (rdev &&
-				    raid5_remove_disk(mddev, rdev) == 0) {
-					sysfs_unlink_rdev(mddev, rdev);
-					rdev->raid_disk = -1;
-				}
+				if (rdev)
+					clear_bit(In_sync, &rdev->flags);
+				rdev = conf->disks[d].replacement;
+				if (rdev)
+					clear_bit(In_sync, &rdev->flags);
 			}
 		}
 		mddev->layout = conf->algorithm;