From f49208ec699cf42fcec8587f6581b4268ef6dea3 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 1 Dec 2010 09:47:21 +1100 Subject: [PATCH] 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 --- super-ddf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/super-ddf.c b/super-ddf.c index 8ef766b..1ff7e54 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;