From: Lukasz Dorau <lukasz.dorau@intel.com>
Date: Wed, 11 Jan 2012 23:57:20 +0000 (+1100)
Subject: fix: container creation with --incremental used.
X-Git-Tag: mdadm-3.2.4~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c4304ca8b3328132537922fed8ee9e3bbb8a0fa;p=thirdparty%2Fmdadm.git

fix: container creation with --incremental used.

If there is no name provided for a container by the metadata it is
always appropriate to use the metadata version name.  create_mddev
will still add a uniquifying digit to the end so there is little risk
of confusion.
This makes the --incremental code behave the same as the --assemble code.

Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Incremental.c b/Incremental.c
index 78c97129..60175af0 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -259,8 +259,7 @@ int Incremental(char *devname, int verbose, int runstop,
 
 	name_to_use = info.name;
 	if (name_to_use[0] == 0 &&
-	    info.array.level == LEVEL_CONTAINER &&
-	    trustworthy == LOCAL) {
+	    info.array.level == LEVEL_CONTAINER) {
 		name_to_use = info.text_version;
 		trustworthy = METADATA;
 	}