From: NeilBrown <neilb@suse.de>
Date: Tue, 28 May 2013 23:13:25 +0000 (+1000)
Subject: Incremental: allow --quiet to silence from errors from "-If"
X-Git-Tag: mdadm-3.3-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041b815f172579018eb85de7476bc6da8adebae5;p=thirdparty%2Fmdadm.git

Incremental: allow --quiet to silence from errors from "-If"

-q is currently ineffective on "mdadm -If".   Messages that are not
usage errors should be suppressed.

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

diff --git a/Incremental.c b/Incremental.c
index 0a75e343..f9c0feb9 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -1611,8 +1611,9 @@ int IncrementalRemove(char *devname, char *id_path, int verbose)
 	}
 	ent = mdstat_by_component(devname);
 	if (!ent) {
-		pr_err("%s does not appear to be a component "
-			"of any array\n", devname);
+		if (verbose >= 0)
+			pr_err("%s does not appear to be a component "
+			       "of any array\n", devname);
 		return 1;
 	}
 	sysfs_init(&mdi, -1, ent->devnm);
@@ -1625,7 +1626,8 @@ int IncrementalRemove(char *devname, char *id_path, int verbose)
 	}
 	mdfd = open_dev(ent->devnm);
 	if (mdfd < 0) {
-		pr_err("Cannot open array %s!!\n", ent->dev);
+		if (verbose >= 0)
+			pr_err("Cannot open array %s!!\n", ent->dev);
 		free_mdstat(ent);
 		return 1;
 	}