diff options
author | Darrick J. Wong <djwong@kernel.org> | 2021-12-11 16:10:24 -0800 |
---|---|---|
committer | Darrick J. Wong <djwong@kernel.org> | 2021-12-15 17:29:32 -0800 |
commit | 1fdf1694aef5a6cb2187eb163118dd4a56aaa88a (patch) | |
tree | 00202b29bf7c0942c4be1e131fe6249e03059f26 | |
parent | 2d3f077efc3b642b133ae05ae5601620451e932f (diff) |
xfs: remove xchk_{start,stop}_reapingrepair-fscounters-exclusive-freeze_2021-12-15djwong-wtf_2021-12-15
Remove this now unnecessary functionality, since we have a better
mechanism and this is racy with freezes and remounts.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
-rw-r--r-- | fs/xfs/scrub/common.c | 26 | ||||
-rw-r--r-- | fs/xfs/scrub/common.h | 2 | ||||
-rw-r--r-- | fs/xfs/scrub/scrub.c | 2 | ||||
-rw-r--r-- | fs/xfs/scrub/scrub.h | 1 |
4 files changed, 0 insertions, 31 deletions
diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index b7db2ef781d3..1463e0cd496b 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -1246,32 +1246,6 @@ xchk_metadata_inode_forks( return error; } -/* Pause background reaping of resources. */ -void -xchk_stop_reaping( - struct xfs_scrub *sc) -{ - sc->flags |= XCHK_REAPING_DISABLED; - xfs_blockgc_stop(sc->mp); - xfs_inodegc_stop(sc->mp); -} - -/* Restart background reaping of resources. */ -void -xchk_start_reaping( - struct xfs_scrub *sc) -{ - /* - * Readonly filesystems do not perform inactivation or speculative - * preallocation, so there's no need to restart the workers. - */ - if (!xfs_is_readonly(sc->mp)) { - xfs_inodegc_start(sc->mp); - xfs_blockgc_start(sc->mp); - } - sc->flags &= ~XCHK_REAPING_DISABLED; -} - /* Complain about failures... */ void xchk_whine( diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h index fca7b1540f84..5208bd2af9ba 100644 --- a/fs/xfs/scrub/common.h +++ b/fs/xfs/scrub/common.h @@ -217,7 +217,5 @@ static inline bool xchk_could_repair(const struct xfs_scrub *sc) #endif /* CONFIG_XFS_ONLINE_REPAIR */ int xchk_metadata_inode_forks(struct xfs_scrub *sc); -void xchk_stop_reaping(struct xfs_scrub *sc); -void xchk_start_reaping(struct xfs_scrub *sc); #endif /* __XFS_SCRUB_COMMON_H__ */ diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c index b4a80aa62112..43cec52160d2 100644 --- a/fs/xfs/scrub/scrub.c +++ b/fs/xfs/scrub/scrub.c @@ -183,8 +183,6 @@ xchk_teardown( sc->flags &= ~XCHK_HAVE_FREEZE_PROT; mnt_drop_write_file(sc->file); } - if (sc->flags & XCHK_REAPING_DISABLED) - xchk_start_reaping(sc); if (sc->xfile) { xfile_destroy(sc->xfile); sc->xfile = NULL; diff --git a/fs/xfs/scrub/scrub.h b/fs/xfs/scrub/scrub.h index 72a86687b21b..74ce22d86aa3 100644 --- a/fs/xfs/scrub/scrub.h +++ b/fs/xfs/scrub/scrub.h @@ -130,7 +130,6 @@ struct xfs_scrub { /* 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_HAVE_FREEZE_PROT (1 << 1) /* do we have freeze protection? */ -#define XCHK_REAPING_DISABLED (1 << 2) /* background block reaping paused */ /* uses atomic metadata file content exchange */ #define XREP_ATOMIC_EXCHANGE (1 << 29) |