From: mwilck@arcor.de <mwilck@arcor.de>
Date: Mon, 8 Jul 2013 21:50:39 +0000 (+0200)
Subject: DDF: write_init_super_ddf: don't zero superblocks for subarrays
X-Git-Tag: mdadm-3.3-rc2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19041058d2e3414db2bff4c2933224b10b65b0a8;p=thirdparty%2Fmdadm.git

DDF: write_init_super_ddf: don't zero superblocks for subarrays

commit d682f344 inserted this call to "Kill" in write_init_super_ddf:

    "Matching the functionality already in super0 and super1, when
    we first create a container, remove any other recognisable metadata to
    ensure it doesn't cause confusion."

But we should do this only at first container creation, not when
subarrays are created later.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/super-ddf.c b/super-ddf.c
index 8f60b72f..87584fa5 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -2964,8 +2964,9 @@ static int write_init_super_ddf(struct supertype *st)
 		return 0;
 	} else {
 		struct dl *d;
-		for (d = ddf->dlist; d; d=d->next)
-			while (Kill(d->devname, NULL, 0, -1, 1) == 0);
+		if (!currentconf)
+			for (d = ddf->dlist; d; d=d->next)
+				while (Kill(d->devname, NULL, 0, -1, 1) == 0);
 		return __write_init_super_ddf(st);
 	}
 }