From: Kinga Tanska <kinga.tanska@intel.com>
Date: Tue, 12 Oct 2021 10:16:16 +0000 (+0200)
Subject: Assemble: apply sysfs rules
X-Git-Tag: mdadm-4.2-rc3~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d64a37b9bf4609444161a73cf8a48b17684b0229;p=thirdparty%2Fmdadm.git

Assemble: apply sysfs rules

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>
---

diff --git a/Assemble.c b/Assemble.c
index 0df46244..20fd97b5 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -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) {