From: Adam Kwolek <adam.kwolek@intel.com>
Date: Mon, 28 Feb 2011 15:07:11 +0000 (+0100)
Subject: FIX: Pass container name to reshape array for external meta data
X-Git-Tag: mdadm-3.2.1~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=864a004f7e5059d845cb5dd177f23ec3c4e0565c;p=thirdparty%2Fmdadm.git

FIX: Pass container name to reshape array for external meta data

When calling reshape_array() for external metadata 'container name'
parameter have to be passed.
Find and pass container name in external metadata case.

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 e4fa196f..cb52cc5a 100644
--- a/Grow.c
+++ b/Grow.c
@@ -3323,10 +3323,18 @@ int Grow_restart(struct supertype *st, struct mdinfo *info, int *fdlist, int cnt
 int Grow_continue(int mdfd, struct supertype *st, struct mdinfo *info,
 		  char *backup_file)
 {
+	char buf[40];
+	char *container = NULL;
 	int err = sysfs_set_str(info, NULL, "array_state", "readonly");
 	if (err)
 		return err;
-	return reshape_array(NULL, mdfd, "array", st, info, 1, backup_file, 0, 0, 1);
+
+	if (st->ss->external) {
+		fmt_devname(buf, st->container_dev);
+		container = buf;
+	}
+	return reshape_array(container, mdfd, "array", st, info, 1,
+			     backup_file, 0, 0, 1);
 }