From: Adam Kwolek <adam.kwolek@intel.com>
Date: Wed, 9 Mar 2011 22:54:56 +0000 (+1100)
Subject: FIX: Load container content for container reshape continuation
X-Git-Tag: mdadm-3.2.1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3db2fdd83486c41eed7c65705f23c9ef9f8c4487;p=thirdparty%2Fmdadm.git

FIX: Load container content for container reshape continuation

st->sb is null. This is exception cause.
reshape_container() function expects that super block will be loaded.

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 40cb9291..5acd94de 100644
--- a/Grow.c
+++ b/Grow.c
@@ -3370,10 +3370,17 @@ int Grow_continue(int mdfd, struct supertype *st, struct mdinfo *info,
 		fmt_devname(buf, st->container_dev);
 		container = buf;
 		freeze(st);
-		if (info->reshape_active == 2)
+
+		if (info->reshape_active == 2) {
+			int cfd = open_dev(st->container_dev);
+			if (cfd < 0)
+				return 1;
+			st->ss->load_container(st, cfd, container);
+			close(cfd);
 			return reshape_container(container, NULL,
 						 st, info, 0, backup_file,
 						 0, 1);
+		}
 	}
 	return reshape_array(container, mdfd, "array", st, info, 1,
 			     backup_file, 0, 0, 1);