NeilBrown: Assemble: fix testing of 'verbose' flag.

Martin F. Krafft madduck at alioth.debian.org
Wed Jan 27 02:03:41 UTC 2010


Module: mdadm
Branch: upstream
Commit: cd77ac4eafb0460ff6229e9a8dd732f2c4dd42c5
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=cd77ac4eafb0460ff6229e9a8dd732f2c4dd42c5

Author: NeilBrown <neilb at suse.de>
Date:   Thu Nov 19 15:55:59 2009 +1100

Assemble: fix testing of 'verbose' flag.

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

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

---

 Assemble.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assemble.c b/Assemble.c
index e1870fc..014d644 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]);




More information about the pkg-mdadm-commits mailing list