From 8e24064c3962caa773ca3df176a0de8c1e2913c2 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 14 Jan 2011 09:14:34 +1100 Subject: [PATCH] --- yaml --- r: 230656 b: refs/heads/master c: 1a940fcee31ec6c18c2f24dbdad31d54e4c35048 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c52a2f03979..ba20f19d6ba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13ae864bc86ff65547ffe7e966b6433a0d0edb8a +refs/heads/master: 1a940fcee31ec6c18c2f24dbdad31d54e4c35048 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index d223a6c0ccc4..5044babfcda0 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -5527,8 +5527,8 @@ static int raid5_start_reshape(mddev_t *mddev) return -ENOSPC; list_for_each_entry(rdev, &mddev->disks, same_set) - if (rdev->raid_disk < 0 && - !test_bit(Faulty, &rdev->flags)) + if ((rdev->raid_disk < 0 || rdev->raid_disk >= conf->raid_disks) + && !test_bit(Faulty, &rdev->flags)) spares++; if (spares - mddev->degraded < mddev->delta_disks - conf->max_degraded) @@ -5588,6 +5588,11 @@ static int raid5_start_reshape(mddev_t *mddev) /* Failure here is OK */; } else break; + } else if (rdev->raid_disk >= conf->previous_raid_disks + && !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, ->degraded