From: Darrick J. Wong <djwong@kernel.org>
Date: Mon, 5 Jun 2023 15:37:56 +0000 (-0700)
Subject: xfs_repair: fix messaging in longform_dir2_entry_check_data
X-Git-Tag: v6.4.0~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=beb78d7558ad8cd2eaa0e60dcb42d2de2b90be80;p=xfsprogs-dev.git

xfs_repair: fix messaging in longform_dir2_entry_check_data

Always log when we're junking a dirent from a non-shortform directory,
because we're fixing corruptions.  Even if we're in !verbose repair
mode.  Otherwise, we print things like:

entry "FOO" in dir inode XXX inconsistent with .. value (YYY) in ino ZZZ

Without telling the user that we're clearing the entry.

Fixes: 6c39a3cbda3 ("Don't trash lost+found in phase 4 Merge of master-melb:xfs-cmds:29144a by kenmcd.")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
---

diff --git a/repair/phase6.c b/repair/phase6.c
index be10d9b75..25bbcd109 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1882,8 +1882,7 @@ _("entry \"%s\" in dir inode %" PRIu64 " inconsistent with .. value (%" PRIu64 "
 				dir_hash_junkit(hashtab, addr);
 				dep->name[0] = '/';
 				libxfs_dir2_data_log_entry(&da, bp, dep);
-				if (verbose)
-					do_warn(
+				do_warn(
 					_("\twill clear entry \"%s\"\n"),
 						fname);
 			} else  {