The decision to emit a warning in fix_inode_reflink_flag seems broken; in
no-modify mode we'll do_warn that we're setting it (even though we don't),
and we'll be silent if it needs to be cleared.
Fix this so it's the standard "would" in no-modify, and "will" in regular
mode. This also ensures that we return the proper status if flags are
found to be incorrect in -n or -e mode.
Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---
diff --git a/repair/rmap.c b/repair/rmap.c
index bffb5b61..7ef2d0fd 100644
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -1142,16 +1142,27 @@ fix_inode_reflink_flag(
struct xfs_dinode *dino;
struct xfs_buf *buf;
+ if (no_modify) {
+ if (set)
+ do_warn(
+_("would set reflink flag on inode %"PRIu64"\n"),
+ XFS_AGINO_TO_INO(mp, agno, agino));
+ else
+ do_warn(
+_("would clear reflink flag on inode %"PRIu64"\n"),
+ XFS_AGINO_TO_INO(mp, agno, agino));
+ return 0;
+ }
+
+ /* Modify mode */
if (set)
do_warn(
_("setting reflink flag on inode %"PRIu64"\n"),
XFS_AGINO_TO_INO(mp, agno, agino));
- else if (!no_modify) /* && !set */
+ else
do_warn(
_("clearing reflink flag on inode %"PRIu64"\n"),
XFS_AGINO_TO_INO(mp, agno, agino));
- if (no_modify)
- return 0;
buf = get_agino_buf(mp, agno, agino, &dino);
if (!buf)
