From: Adam Kwolek <adam.kwolek@intel.com>
Date: Wed, 9 Mar 2011 22:58:35 +0000 (+1100)
Subject: FIX: Make expansion counter usable
X-Git-Tag: mdadm-3.2.1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=140320165221099dd637fc84b60fe53f0d714c77;p=thirdparty%2Fmdadm.git

FIX: Make expansion counter usable

Currently whole array geometry is set in sysfs_set_array(),
so none of disks (even for expansion) should fail during sysfs_add_disk()
Due to this expansion counter should be used for reshaped array when
disk slot is bigger than number of disks in array.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index fe917b27..0ffbbc9a 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1526,13 +1526,14 @@ int assemble_container_content(struct supertype *st, int mdfd,
 		sysfs_free(sra);
 
 	for (dev = content->devs; dev; dev = dev->next)
-		if (sysfs_add_disk(content, dev, 1) == 0)
-			working++;
-		else if (errno == EEXIST)
+		if (sysfs_add_disk(content, dev, 1) == 0) {
+			if (dev->disk.raid_disk >= content->array.raid_disks &&
+			    content->reshape_active)
+				expansion++;
+			else
+				working++;
+		} else if (errno == EEXIST)
 			preexist++;
-		else if (dev->disk.raid_disk >= content->array.raid_disks &&
-			  content->reshape_active)
-			expansion++;
 	if (working == 0)
 		return 1;/* Nothing new, don't try to start */