From: Adam Kwolek <adam.kwolek@intel.com>
Date: Tue, 19 Apr 2011 07:25:43 +0000 (+1000)
Subject: FIX: Check correctly raid disks during reshape restart
X-Git-Tag: mdadm-3.2.2~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=384e9be1330c29b40559f85dd0e6124bd0dfa535;p=thirdparty%2Fmdadm.git

FIX: Check correctly raid disks during reshape restart

During reshape restart info->array.raid_disks contains new raid_disks number
It cannot be compared against old disks number. Such check will always fail.

Check raid disks array field against final disks number for restart.

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

diff --git a/Grow.c b/Grow.c
index 9c1f096a..9c630369 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1692,7 +1692,8 @@ static int reshape_array(char *container, int fd, char *devname,
 	if (restart &&
 	    (reshape.level != info->array.level ||
 	     reshape.before.layout != info->array.layout ||
-	     reshape.before.data_disks + reshape.parity != info->array.raid_disks)) {
+	     reshape.before.data_disks + reshape.parity
+	     != info->array.raid_disks - info->delta_disks)) {
 		fprintf(stderr, Name ": reshape info is not in native format -"
 			" cannot continue.\n");
 		goto release;