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 be10d9b7536bdf3a241d92ae9672b7220620ba1d..25bbcd1097165b72a90b2aee57e60b065741aa67 100644 (file)
--- 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  {