@@ -69,7 +69,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;
@@ -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,
@@ -762,7 +762,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) {
@@ -815,11 +815,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 {
@@ -86,7 +86,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);