From: Dan Williams <dan.j.williams@intel.com>
Date: Thu, 18 Nov 2010 09:22:09 +0000 (+0100)
Subject: Grow: fix check for raid6 layout normalization
X-Git-Tag: mdadm-3.2~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72e4a378221acbc786f2a8eefa4c0f240b21b308;p=thirdparty%2Fmdadm.git

Grow: fix check for raid6 layout normalization

If the user does not specify a layout, don't skip asking about retaining
the non-standard raid6 layout which may be implicitly changed.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index b65cbcbd..abbb3d9e 100644
--- a/Grow.c
+++ b/Grow.c
@@ -733,9 +733,9 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 
 	/* ========= set shape (chunk_size / layout / ndisks)  ============== */
 	/* Check if layout change is a no-op */
-	if (layout_str) switch(array.level) {
+	switch(array.level) {
 	case 5:
-		if (array.layout == map_name(r5layout, layout_str))
+		if (layout_str && array.layout == map_name(r5layout, layout_str))
 			layout_str = NULL;
 		break;
 	case 6:
@@ -751,8 +751,9 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 			rv = 1;
 			goto release;
 		}
-		if (strcmp(layout_str, "normalise") == 0 ||
-		    strcmp(layout_str, "normalize") == 0) {
+		if (layout_str &&
+		    (strcmp(layout_str, "normalise") == 0 ||
+		     strcmp(layout_str, "normalize") == 0)) {
 			char *hyphen;
 			strcpy(alt_layout, map_num(r6layout, array.layout));
 			hyphen = strrchr(alt_layout, '-');
@@ -762,7 +763,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 			}
 		}
 
-		if (array.layout == map_name(r6layout, layout_str))
+		if (layout_str && array.layout == map_name(r6layout, layout_str))
 			layout_str = NULL;
 		if (layout_str && strcmp(layout_str, "preserve") == 0)
 			layout_str = NULL;