]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Assemble: apply sysfs rules
authorKinga Tanska <kinga.tanska@intel.com>
Tue, 12 Oct 2021 10:16:16 +0000 (12:16 +0200)
committerJes Sorensen <jsorensen@fb.com>
Tue, 19 Oct 2021 06:50:34 +0000 (02:50 -0400)
During assemblation container with quiet flag, sysfs rules are not applied.
This commit makes sysfs_rules_apply() independent from verbose condition.

Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Assemble.c

index 0df46244d7fb6dfcc929b1f8259fe1661c44c071..20fd97b5980ded4db0997c7d9c95b8e012b00217 100644 (file)
@@ -1125,6 +1125,7 @@ static int start_array(int mdfd,
        }
 
        if (content->array.level == LEVEL_CONTAINER) {
+               sysfs_rules_apply(mddev, content);
                if (c->verbose >= 0) {
                        pr_err("Container %s has been assembled with %d drive%s",
                               mddev, okcnt + sparecnt + journalcnt,
@@ -1132,10 +1133,8 @@ static int start_array(int mdfd,
                        if (okcnt < (unsigned)content->array.raid_disks)
                                fprintf(stderr, " (out of %d)\n",
                                        content->array.raid_disks);
-                       else {
+                       else
                                fprintf(stderr, "\n");
-                               sysfs_rules_apply(mddev, content);
-                       }
                }
 
                if (st->ss->validate_container) {