From: Adam Kwolek <adam.kwolek@intel.com>
Date: Tue, 8 Mar 2011 12:24:55 +0000 (+0100)
Subject: FIX: Check correct 'old' level to see if reshape is needed.
X-Git-Tag: mdadm-3.2.1~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eae35f5c55281caa3ba6be0d77ad9a1c6b74bbd8;p=thirdparty%2Fmdadm.git

FIX: Check correct 'old' level to see if reshape is needed.

Normally when reshape_array is called with restart == 0,
info->array is the same as the 'array' read from the kernel
(via ioctl) so both have the same level.

However when called from reshape_container, info->array was
generated by the metadata so it will have 'level' set to the
intermediate (or final) level already.

So to test if we need to change the level, we need to compare the
desired level with that which was loaded from the kernel (array.level)
rather than that which was read from metadata (info->array.level).

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 2c99924b..ecbc837e 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1707,7 +1707,7 @@ static int reshape_array(char *container, int fd, char *devname,
 		goto release;
 	}
 
-	if (reshape.level != info->array.level) {
+	if (reshape.level != array.level) {
 		char *c = map_num(pers, reshape.level);
 		int err;
 		if (c == NULL)
@@ -1727,7 +1727,7 @@ static int reshape_array(char *container, int fd, char *devname,
 		if (!quiet)
 			fprintf(stderr, Name ": level of %s changed to %s\n",
 				devname, c);	
-		orig_level = info->array.level;
+		orig_level = array.level;
 		sysfs_freeze_array(info);
 
 		if (reshape.level > 0 && st->ss->external) {