summaryrefslogtreecommitdiff
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-05-22 13:55:33 +1000
committerNeilBrown <neilb@suse.de>2012-05-22 13:55:33 +1000
commitda7613b8b042ab1d3ea55459ed97301e4a2097bb (patch)
tree5a6fe23c5fbbb15f3ff459752807a00ddf121c55 /drivers/md
parent0c098220e2320c1f0c9339d0ff05c5e04672133a (diff)
downloadlinux-3.10-da7613b8b042ab1d3ea55459ed97301e4a2097bb.tar.gz
linux-3.10-da7613b8b042ab1d3ea55459ed97301e4a2097bb.tar.bz2
linux-3.10-da7613b8b042ab1d3ea55459ed97301e4a2097bb.zip
md/raid5: improve removal of extra devices after reshape.
After a reshape which reduced the number of devices we need to disconnect the extra devices. The code for this doesn't currently handle 'replacement' devices. It is very unlikely that such devices will be present, but it is safest to handle them anyway. So simplify the handling. Just clear In_sync and leave it to remove_and_add_spaces (which will be called soon) to do the real works. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid5.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 8fba57e8f78..d26767246d2 100644
--- a/drivers/md/raid5.c
+++ b/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;