From: Hannes Reinecke <hare@suse.de>
Date: Wed, 9 Mar 2016 05:20:18 +0000 (+0800)
Subject: Fix regression during add devices
X-Git-Tag: mdadm-4.0~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d31d0f5218e96a2a3a0c9b4418bb387ec211dd0d;p=thirdparty%2Fmdadm.git

Fix regression during add devices

Commit d180d2aa2a17 ("Manage: fix test for 'is array failed'.")
introduced a regression which would not allow to re-add new
drivers to a failed array.

Fixes: d180d2aa2a17 ("Manage: fix test for 'is array failed'.")
Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: Coly Li <colyli@suse.de>
Cc: Neil Brown <neilb@suse.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---

diff --git a/Manage.c b/Manage.c
index ab4ac09f..e3d46f3b 100644
--- a/Manage.c
+++ b/Manage.c
@@ -880,10 +880,10 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv,
 					continue;
 				if (disc.major == 0 && disc.minor == 0)
 					continue;
-				found++;
 				if (!(disc.state & (1<<MD_DISK_SYNC)))
 					continue;
 				avail[disc.raid_disk] = 1;
+				found++;
 			}
 			array_failed = !enough(array->level, array->raid_disks,
 					       array->layout, 1, avail);