From: Masatake YAMATO <yamato@redhat.com>
To: linux-xfs@vger.kernel.org
Cc: yamato@redhat.com
Subject: [PATCH] xfs_repair: don't use do_warn for normal log message
Date: Wed, 13 Sep 2017 19:49:43 +0900 [thread overview]
Message-ID: <20170913104943.22034-1-yamato@redhat.com> (raw)
In some case, exit statuses of xfs_repair -n are 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.
The original zero_log():
error = xlog_find_tail(log, &head_blk, &tail_blk);
if (error) {...
} else {
if (verbose) {
do_warn(
_("zero_log: head block %" PRId64 " tail block %" PRId64 "\n"),
head_blk, tail_blkn);
}
do_warn() is used for the message, "zero_log:...". do_log
should be used instead because this log message is for just reporting the
values of head_blk, and tail_blk. do_log is for "just reporting".
Using do_warn unintentionally has an impact.
It causes the exit status of the command.
do_warn sets fs_is_dirty global variable.
That refers in main function to decide the exit status.
void
do_warn(char const *msg, ...)
{
va_list args;
fs_is_dirty = 1;
int
main(int argc, char **argv)
{
...
if (fs_is_dirty)
return(1);
---
repair/phase2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/repair/phase2.c b/repair/phase2.c
index c21778b8..f7ea655f 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -75,7 +75,7 @@ zero_log(
*/
error = xlog_find_tail(log, &head_blk, &tail_blk);
if (error) {
- do_warn(
+ do_log(
_("zero_log: cannot find log head/tail (xlog_find_tail=%d)\n"),
error);
if (!no_modify && !zap_log)
--
2.13.5
next reply other threads:[~2017-09-13 10:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-13 10:49 Masatake YAMATO [this message]
2017-09-13 21:48 ` [PATCH] xfs_repair: don't use do_warn for normal log message Dave Chinner
2017-09-14 2:19 ` Masatake YAMATO
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170913104943.22034-1-yamato@redhat.com \
--to=yamato@redhat.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox