From: Adam Kwolek <adam.kwolek@intel.com>
Date: Wed, 12 Jan 2011 23:15:54 +0000 (+1100)
Subject: FIX: Cannot load container information
X-Git-Tag: mdadm-3.2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb744788d10fd038fd57920149615775bc4b121c;p=thirdparty%2Fmdadm.git

FIX: Cannot load container information

When container is passed to grow_reshape(), load_container() function
has to be used to get all required information from metadata.
So load_super is never correct here - in particular, cfd is a
'container fd' so we must 'load_container' on it.

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 898eb3eb..2aba377a 100644
--- a/Grow.c
+++ b/Grow.c
@@ -1351,10 +1351,8 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 		fmt_devname(container_buf, container_dev);
 		container = container_buf;
 
-		if (subarray)
-			rv = st->ss->load_container(st, cfd, NULL);
-		else
-			rv = st->ss->load_super(st, cfd, NULL);
+		rv = st->ss->load_container(st, cfd, NULL);
+
 		if (rv) {
 			fprintf(stderr, Name ": Cannot read superblock for %s\n",
 				devname);