From: Przemyslaw Czarnowski Date: Sun, 26 Dec 2010 11:33:14 +0000 (+1100) Subject: Added test for array degradation for spare-same-slot X-Git-Tag: mdadm-3.2~152 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4924220f1ab5ae078287411058ec5294e360e2d;p=thirdparty%2Fmdadm.git Added test for array degradation for spare-same-slot spare-same-slot allows re-adding of missing array member with disk re-inserted into the same slot where previous member was plugged in. If in the meantime another spare has been used for recovery, same slot cookie should be ignored. Signed-off-by: Przemyslaw Czarnowski Signed-off-by: NeilBrown --- diff --git a/Incremental.c b/Incremental.c index 6ff64f3a..ee476dab 100644 --- a/Incremental.c +++ b/Incremental.c @@ -966,11 +966,13 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, * arrays/containers that match 'target'. * If 'target' is set and 'bare' is true, we prefer the * array which matches 'target'. + * target is considered only if we deal with degraded array */ if (target) { if (strcmp(target->metadata, mp->metadata) == 0 && memcmp(target->uuid, mp->uuid, - sizeof(target->uuid)) == 0) { + sizeof(target->uuid)) == 0 && + sra->array.failed_disks > 0) { /* This is our target!! */ if (chosen) sysfs_free(chosen);