diff options
| author | Mark Brown <broonie@kernel.org> | 2023-05-23 23:03:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-05-23 23:03:49 +0100 |
| commit | 90d0d6009c0f6b0693ac58096c655a2df61e0d50 (patch) | |
| tree | b076f02b48dc57f295981e27965bb28e571b5cbc /fs/xfs/scrub/fscounters.c | |
| parent | 53632462666c378774f7665960f0ab67ac22f77a (diff) | |
| parent | 44c026a73be8038f03dbdeef028b642880cf1511 (diff) | |
regmap: Merge up v6.4-rc3
Merge up v6.4-rc3 to get fixes which make my CI more stable.
Diffstat (limited to 'fs/xfs/scrub/fscounters.c')
| -rw-r--r-- | fs/xfs/scrub/fscounters.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/xfs/scrub/fscounters.c b/fs/xfs/scrub/fscounters.c index faa315be7978..e382a35e98d8 100644 --- a/fs/xfs/scrub/fscounters.c +++ b/fs/xfs/scrub/fscounters.c @@ -150,13 +150,6 @@ xchk_setup_fscounters( if (error) return error; - /* - * Pause background reclaim while we're scrubbing to reduce the - * likelihood of background perturbations to the counters throwing off - * our calculations. - */ - xchk_stop_reaping(sc); - return xchk_trans_alloc(sc, 0); } @@ -454,6 +447,12 @@ xchk_fscounters( xchk_set_corrupt(sc); /* + * XXX: We can't quiesce percpu counter updates, so exit early. + * This can be re-enabled when we gain exclusive freeze functionality. + */ + return 0; + + /* * If ifree exceeds icount by more than the minimum variance then * something's probably wrong with the counters. */ |