From: NeilBrown <neilb@suse.de>
Date: Wed, 9 Mar 2011 07:47:24 +0000 (+1100)
Subject: Grow: only check 'native format' when really needed.
X-Git-Tag: mdadm-3.2.1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=817ed7d6d6d92628aabc19e1216cbcbaf8c3450b;p=thirdparty%2Fmdadm.git

Grow: only check 'native format' when really needed.

The check that the array info is already in 'native format' is
only relevant when restarting a growth, so only perform it then.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index ecbc837e..32263b0d 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1651,9 +1651,10 @@ static int reshape_array(char *container, int fd, char *devname,
 		fprintf(stderr, Name ": %s\n", msg);
 		goto release;
 	}
-	if (reshape.level != info->array.level ||
-	    reshape.before.layout != info->array.layout ||
-	    reshape.before.data_disks + reshape.parity != info->array.raid_disks) {
+	if (restart &&
+	    (reshape.level != info->array.level ||
+	     reshape.before.layout != info->array.layout ||
+	     reshape.before.data_disks + reshape.parity != info->array.raid_disks)) {
 		fprintf(stderr, Name ": reshape info is not in native format -"
 			" cannot continue.\n");
 		goto release;