You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.2 KiB
35 lines
1.2 KiB
7 years ago
|
From 67ea25fe9d663f69b550b39ce86b074534ae7c85 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Masatake YAMATO <yamato@redhat.com>
|
||
|
|
Date: Fri, 15 Sep 2017 13:42:18 -0500
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
repair/phase2.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: xfsprogs-4.5.0/repair/phase2.c
|
||
|
|
===================================================================
|
||
|
|
--- xfsprogs-4.5.0.orig/repair/phase2.c
|
||
|
|
+++ xfsprogs-4.5.0/repair/phase2.c
|
||
|
|
@@ -85,7 +85,7 @@ zero_log(
|
||
|
|
"attempt a repair.\n"));
|
||
|
|
} else {
|
||
|
|
if (verbose) {
|
||
|
|
- do_warn(
|
||
|
|
+ do_log(
|
||
|
|
_("zero_log: head block %" PRId64 " tail block %" PRId64 "\n"),
|
||
|
|
head_blk, tail_blk);
|
||
|
|
}
|