---

yaml --- r: 156695 b: refs/heads/master c: 1a67dde h: refs/heads/master i: 156693: 5dfb5d6 156691: 55f6729 156687: 8a46c8a v: v3
git-mirror · Aug 13, 2009 · c63e430 · c63e430
1 parent f486f65
commit c63e430
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a639755cf885e437b2fe4168d35157fa90d530ab
+refs/heads/master: 1a67dde0abba36421a1257d01ba9de2f6d1c160a
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -5097,8 +5097,15 @@ static void raid5_finish_reshape(mddev_t *mddev)
 					mddev->degraded--;
 			for (d = conf->raid_disks ;
 			     d < conf->raid_disks - mddev->delta_disks;
-			     d++)
-				raid5_remove_disk(mddev, d);
+			     d++) {
+				mdk_rdev_t *rdev = conf->disks[d].rdev;
+				if (rdev && raid5_remove_disk(mddev, d) == 0) {
+					char nm[20];
+					sprintf(nm, "rd%d", rdev->raid_disk);
+					sysfs_remove_link(&mddev->kobj, nm);
+					rdev->raid_disk = -1;
+				}
+			}
 		}
 		mddev->layout = conf->algorithm;
 		mddev->chunk_sectors = conf->chunk_sectors;