File xfsprogs-xfs_repair-Add-missing-braces-to-allow... of Package xfsprogs

Overview Repositories Revisions Requests Users Attributes Meta

File xfsprogs-xfs_repair-Add-missing-braces-to-allow-zeroing-of-co.patch of Package xfsprogs (Revision 874763de357e57b8d41ce000fb9c8b02)

Currently displaying revision 874763de357e57b8d41ce000fb9c8b02 , Show latest

From a2e81058c167b6b9761b46883cdd6371616a2de6 Mon Sep 17 00:00:00 2001
From: Xiao Yang <yangx.jy@cn.fujitsu.com>
Date: Thu, 8 Mar 2018 20:35:20 -0600
Subject: [PATCH] xfs_repair: Add missing braces to allow zeroing of corrupt
 log
Git-commit: a2e81058c167b6b9761b46883cdd6371616a2de6
Patch-mainline: v4.16.0-rc1
References: bsc#1073421

When xlog_find_tail() fails to find the head or the tail, the missing
braces leads that an unparseable log always exits with status 2, even
if we've asked for -n or -L which should proceed.  We can expose this
issue by xfstests case xfs/098.

Fixes: commit b04647edea32 ("xfs_repair: exit with status 2 if log dirtiness is unknown")

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>

---
 repair/phase2.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/repair/phase2.c b/repair/phase2.c
index 992e997b..c1248826 100644
--- a/repair/phase2.c
+++ b/repair/phase2.c
@@ -78,12 +78,13 @@ zero_log(
 		do_warn(
 		_("zero_log: cannot find log head/tail (xlog_find_tail=%d)\n"),
 			error);
-		if (!no_modify && !zap_log)
+		if (!no_modify && !zap_log) {
 			do_warn(_(
 "ERROR: The log head and/or tail cannot be discovered. Attempt to mount the\n"
 "filesystem to replay the log or use the -L option to destroy the log and\n"
 "attempt a repair.\n"));
 			exit(2);
+		}
 	} else {
 		if (verbose) {
 			do_log(
-- 
2.16.4

Places

File xfsprogs-xfs_repair-Add-missing-braces-to-allow-zeroing-of-co.patch of Package xfsprogs (Revision 874763de357e57b8d41ce000fb9c8b02)

Places