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 0d97b9f171114639c8a13fd7c6df6ea5d6fa02fc..79248326f861fe3ac43685b1a4abb5b125ab7659 100644 (file)
--- 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 4be950e707f8efc1c9579aafcc38f61eb98ca30d..c8693ccf3ebfa32d94979e1b5884ca4810028070 100644 (file)
--- 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 36f5a2d561b671e858b9e39a263997ab742c5fc4..dd8498c095ad1844b7278c58f1dd6463e6b69acc 100644 (file)
--- 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 97fbe9978738b56e94745a3137c3e079d34db072..34c3dd30c089aa8892167964358f07a8e1f88dfd 100644 (file)
--- 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);