From: NeilBrown <neilb@suse.de>
Date: Thu, 19 Nov 2009 04:55:59 +0000 (+1100)
Subject: Assemble: fix testing of 'verbose' flag.
X-Git-Tag: mdadm-3.1.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd77ac4eafb0460ff6229e9a8dd732f2c4dd42c5;p=thirdparty%2Fmdadm.git

Assemble: fix testing of 'verbose' flag.

The 'verbose' flag can be negative, meaning 'quiet'.
So never check for != 0.

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

diff --git a/Assemble.c b/Assemble.c
index e1870fc5..014d644b 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -990,7 +990,7 @@ int Assemble(struct supertype *st, char *mddev,
 	if (content->reshape_active) {
 		int err = 0;
 		int *fdlist = malloc(sizeof(int)* bestcnt);
-		if (verbose)
+		if (verbose > 0)
 			fprintf(stderr, Name ":%s has an active reshape - checking "
 				"if critical section needs to be restored\n",
 				chosen_name);
@@ -1008,7 +1008,7 @@ int Assemble(struct supertype *st, char *mddev,
 				fdlist[i] = -1;
 		}
 		if (!err)
-			err = Grow_restart(st, content, fdlist, bestcnt, backup_file, verbose);
+			err = Grow_restart(st, content, fdlist, bestcnt, backup_file, verbose > 0);
 		while (i>0) {
 			i--;
 			if (fdlist[i]>=0) close(fdlist[i]);