---

yaml --- r: 305965 b: refs/heads/master c: da7613b h: refs/heads/master i: 305963: e16eeac v: v3
git-mirror · May 22, 2012 · 80ffeb0 · 80ffeb0
1 parent 453369c
commit 80ffeb0
Show file tree

Hide file tree

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