From: NeilBrown <neilb@suse.de>
Date: Tue, 30 Nov 2010 22:47:21 +0000 (+1100)
Subject: ddf: don't print warning on assemble
X-Git-Tag: mdadm-3.2~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f49208ec699cf42fcec8587f6581b4268ef6dea3;p=thirdparty%2Fmdadm.git

ddf: don't print warning on assemble

Now that we check the error return of 'update_super' better, we
much make sure that ddf doesn't incorrectly report that the
superblocks are wrong during assemble.

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

diff --git a/super-ddf.c b/super-ddf.c
index 8ef766b7..1ff7e545 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -1526,13 +1526,16 @@ static int update_super_ddf(struct supertype *st, struct mdinfo *info,
 //		if (info->vendor_is_local)
 //			strcpy(ddf->controller.vendor_data, homehost);
 		rv = -1;
-	} if (strcmp(update, "name") == 0) {
+	} else if (strcmp(update, "name") == 0) {
 		/* name is stored in virtual_entry->name */
 //		memset(ve->name, ' ', 16);
 //		strncpy(ve->name, info->name, 16);
 		rv = -1;
-	} if (strcmp(update, "_reshape_progress") == 0) {
+	} else if (strcmp(update, "_reshape_progress") == 0) {
 		/* We don't support reshape yet */
+	} else if (strcmp(update, "assemble") == 0 ) {
+		/* Do nothing, just succeed */
+		rv = 0;
 	} else
 		rv = -1;