linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] xfs_repair: warn properly about reflink flag with and without -n
@ 2018-09-12 19:26 Eric Sandeen
  2018-09-12 22:05 ` Eric Sandeen
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Sandeen @ 2018-09-12 19:26 UTC (permalink / raw)
  To: linux-xfs

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@redhat.com>
---

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)

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-09-17 21:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-12 19:26 [PATCH] xfs_repair: warn properly about reflink flag with and without -n Eric Sandeen
2018-09-12 22:05 ` Eric Sandeen
2018-09-17 16:24   ` Darrick J. Wong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).