From 160b5a784525e8a44902873f1938e1f4d77fe112 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 16 Apr 2019 08:22:00 -0700 Subject: xfs: hoist the already_fixed variable to the scrub context Now that we no longer memset the scrub context, we can move the already_fixed variable into the scrub context's state flags instead of passing around pointers to separate stack variables. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner --- fs/xfs/scrub/scrub.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'fs/xfs/scrub/scrub.h') diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h index 60359e7de930..9e8d3d7377f2 100644 --- a/fs/xfs/scrub/scrub.h +++ b/fs/xfs/scrub/scrub.h @@ -63,16 +63,17 @@ struct xfs_scrub { void *buf; uint ilock_flags; - /* See the XCHK state flags below. */ + /* See the XCHK/XREP state flags below. */ unsigned int flags; /* State tracking for single-AG operations. */ struct xchk_ag sa; }; -/* XCHK state flags */ +/* XCHK state flags grow up from zero, XREP state flags grown down from 2^31 */ #define XCHK_TRY_HARDER (1 << 0) /* can't get resources, try again */ #define XCHK_HAS_QUOTAOFFLOCK (1 << 1) /* we hold the quotaoff lock */ +#define XREP_ALREADY_FIXED (1 << 31) /* checking our repair work */ /* Metadata scrubbers */ int xchk_tester(struct xfs_scrub *sc); -- cgit v1.2.3-70-g09d2