From c237f29e8a0982139e1c364659e2bdd34c1b7dfc Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 13 Mar 2012 11:21:21 +1100 Subject: [PATCH] --- yaml --- r: 292787 b: refs/heads/master c: 9d4c7d8799c418816342e263479fa010b182183e h: refs/heads/master i: 292785: 5811cb0ded09ae0db25fb9ccb46a4cabc4a2a930 292783: 9b0a029b25422fd8d618ebf120797c873b2bc358 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e1a0ddaa1697..82940f90b915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 547414d19fd72376ff2ecc42aac8d7a051f03d26 +refs/heads/master: 9d4c7d8799c418816342e263479fa010b182183e diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 8b3eb41d3eef..3f55145ff224 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -5547,16 +5547,14 @@ static int raid5_start_reshape(struct mddev *mddev) * such devices during the reshape and confusion could result. */ if (mddev->delta_disks >= 0) { - int added_devices = 0; list_for_each_entry(rdev, &mddev->disks, same_set) if (rdev->raid_disk < 0 && !test_bit(Faulty, &rdev->flags)) { if (raid5_add_disk(mddev, rdev) == 0) { if (rdev->raid_disk - >= conf->previous_raid_disks) { + >= conf->previous_raid_disks) set_bit(In_sync, &rdev->flags); - added_devices++; - } else + else rdev->recovery_offset = 0; if (sysfs_link_rdev(mddev, rdev)) @@ -5566,7 +5564,6 @@ static int raid5_start_reshape(struct mddev *mddev) && !test_bit(Faulty, &rdev->flags)) { /* This is a spare that was manually added */ set_bit(In_sync, &rdev->flags); - added_devices++; } /* When a reshape changes the number of devices,