From: Masatake YAMATO <yamato@redhat.com>
Date: Fri, 15 Sep 2017 18:42:18 +0000 (-0500)
Subject: xfs_repair: don't use do_warn for normal log message
X-Git-Tag: v4.13.0-rc1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67ea25fe9d663f69b550b39ce86b074534ae7c85;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: don't use do_warn for normal log message

In some case, exit status of xfs_repair -n is different even for
the same file system when -v is specified or not. This patch fixes
this behavior.

If -v is specified, do_warn() is used in zero_log() for printing
a normal message. That makes the exit status to 1 though there
is no dirtiness in the file system.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
[sandeen: edit changelog for brevity]
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/repair/phase2.c b/repair/phase2.c
index 0085732b3..992e997b0 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -86,7 +86,7 @@ zero_log(
 			exit(2);
 	} else {
 		if (verbose) {
-			do_warn(
+			do_log(
 	_("zero_log: head block %" PRId64 " tail block %" PRId64 "\n"),
 				head_blk, tail_blk);
 		}