]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
ddf: don't print warning on assemble
authorNeilBrown <neilb@suse.de>
Tue, 30 Nov 2010 22:47:21 +0000 (09:47 +1100)
committerNeilBrown <neilb@suse.de>
Tue, 30 Nov 2010 22:47:21 +0000 (09:47 +1100)
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>
super-ddf.c

index 8ef766b7b0b17079f87735173c95a467007bf3cb..1ff7e545ce83f432859112d9eb399cfbc8d5d958 100644 (file)
@@ -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;