From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Wed, 1 Aug 2018 22:06:44 +0000 (-0500)
Subject: xfs_scrub: rename NOFIX_COMPLAIN to be less confusing
X-Git-Tag: v4.18.0-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06e49f3ed2178ddd140e0a58a840665d1b04ea5b;p=thirdparty%2Fxfsprogs-dev.git

xfs_scrub: rename NOFIX_COMPLAIN to be less confusing

Rename NOFIX_COMPLAIN to COMPLAIN_IF_UNFIXED so that the symbolic name
is less confusing as to what the flag is supposed to mean.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/scrub/phase4.c b/scrub/phase4.c
index 0d97b9f17..79248326f 100644
--- a/scrub/phase4.c
+++ b/scrub/phase4.c
@@ -55,7 +55,7 @@ xfs_repair_ag(
 		return;
 
 	/* Try once more, but this time complain if we can't fix things. */
-	flags |= ALP_NOFIX_COMPLAIN;
+	flags |= ALP_COMPLAIN_IF_UNFIXED;
 	moveon = xfs_action_list_process(ctx, ctx->mnt_fd, alist, flags);
 	if (!moveon)
 		*pmoveon = false;
diff --git a/scrub/repair.h b/scrub/repair.h
index 4be950e70..c8693ccf3 100644
--- a/scrub/repair.h
+++ b/scrub/repair.h
@@ -29,7 +29,7 @@ void xfs_action_list_find_mustfix(struct xfs_action_list *actions,
 
 /* Passed through to xfs_repair_metadata() */
 #define ALP_REPAIR_ONLY		(XRM_REPAIR_ONLY)
-#define ALP_NOFIX_COMPLAIN	(XRM_NOFIX_COMPLAIN)
+#define ALP_COMPLAIN_IF_UNFIXED	(XRM_COMPLAIN_IF_UNFIXED)
 #define ALP_NOPROGRESS		(1U << 31)
 
 bool xfs_action_list_process(struct scrub_ctx *ctx, int fd,
diff --git a/scrub/scrub.c b/scrub/scrub.c
index 36f5a2d56..dd8498c09 100644
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -748,7 +748,7 @@ xfs_repair_metadata(
 	 * If the caller doesn't want us to complain, tell the caller to
 	 * requeue the repair for later and don't say a thing.
 	 */
-	if (!(repair_flags & XRM_NOFIX_COMPLAIN) &&
+	if (!(repair_flags & XRM_COMPLAIN_IF_UNFIXED) &&
 	    (error || needs_repair(&meta)))
 		return CHECK_RETRY;
 	if (error) {
@@ -801,11 +801,11 @@ _("Read-only filesystem; cannot make changes."));
 			return CHECK_DONE;
 		}
 	}
-	if (repair_flags & XRM_NOFIX_COMPLAIN)
+	if (repair_flags & XRM_COMPLAIN_IF_UNFIXED)
 		xfs_scrub_warn_incomplete_scrub(ctx, buf, &meta);
 	if (needs_repair(&meta)) {
 		/* Still broken, try again or fix offline. */
-		if ((repair_flags & XRM_NOFIX_COMPLAIN) || debug)
+		if ((repair_flags & XRM_COMPLAIN_IF_UNFIXED) || debug)
 			str_error(ctx, buf,
 _("Repair unsuccessful; offline repair required."));
 	} else {
diff --git a/scrub/scrub.h b/scrub/scrub.h
index 97fbe9978..34c3dd30c 100644
--- a/scrub/scrub.h
+++ b/scrub/scrub.h
@@ -72,7 +72,7 @@ struct action_item {
 #define XRM_REPAIR_ONLY		(1U << 0)
 
 /* Complain if still broken even after fix. */
-#define XRM_NOFIX_COMPLAIN	(1U << 1)
+#define XRM_COMPLAIN_IF_UNFIXED	(1U << 1)
 
 enum check_outcome xfs_repair_metadata(struct scrub_ctx *ctx, int fd,
 		struct action_item *aitem, unsigned int repair_flags);