提交 bc28c3c9 编写于 作者: D Darrick J. Wong 提交者: Zheng Zengkai

xfs: rename block gc start and stop functions

mainline-inclusion
from mainline-v5.11-rc4
commit c9a6526f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4KIAO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c9a6526fe7ae64528d924c6f255af15312211432

-------------------------------------------------

Shorten the names of the two functions that start and stop block
preallocation garbage collection and move them up to the other blockgc
functions.
Signed-off-by: NDarrick J. Wong <djwong@kernel.org>
Reviewed-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NLihong Kou <koulihong@huawei.com>
Reviewed-by: NZhang Yi <yi.zhang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 599dbcfd
......@@ -904,7 +904,7 @@ xchk_stop_reaping(
struct xfs_scrub *sc)
{
sc->flags |= XCHK_REAPING_DISABLED;
xfs_stop_block_reaping(sc->mp);
xfs_blockgc_stop(sc->mp);
}
/* Restart background reaping of resources. */
......@@ -912,6 +912,6 @@ void
xchk_start_reaping(
struct xfs_scrub *sc)
{
xfs_start_block_reaping(sc->mp);
xfs_blockgc_start(sc->mp);
sc->flags &= ~XCHK_REAPING_DISABLED;
}
......@@ -1557,7 +1557,7 @@ xfs_inode_clear_cowblocks_tag(
/* Disable post-EOF and CoW block auto-reclamation. */
void
xfs_stop_block_reaping(
xfs_blockgc_stop(
struct xfs_mount *mp)
{
cancel_delayed_work_sync(&mp->m_blockgc_work);
......@@ -1565,7 +1565,7 @@ xfs_stop_block_reaping(
/* Enable post-EOF and CoW block auto-reclamation. */
void
xfs_start_block_reaping(
xfs_blockgc_start(
struct xfs_mount *mp)
{
xfs_blockgc_queue(mp);
......
......@@ -75,7 +75,7 @@ int xfs_inode_walk(struct xfs_mount *mp, int iter_flags,
int xfs_icache_inode_is_allocated(struct xfs_mount *mp, struct xfs_trans *tp,
xfs_ino_t ino, bool *inuse);
void xfs_stop_block_reaping(struct xfs_mount *mp);
void xfs_start_block_reaping(struct xfs_mount *mp);
void xfs_blockgc_stop(struct xfs_mount *mp);
void xfs_blockgc_start(struct xfs_mount *mp);
#endif
......@@ -1062,7 +1062,7 @@ xfs_unmountfs(
uint64_t resblks;
int error;
xfs_stop_block_reaping(mp);
xfs_blockgc_stop(mp);
xfs_fs_unreserve_ag_blocks(mp);
xfs_qm_unmount_quotas(mp);
xfs_rtunmount_inodes(mp);
......
......@@ -944,7 +944,7 @@ xfs_fs_freeze(
* set a GFP_NOFS context here to avoid recursion deadlocks.
*/
flags = memalloc_nofs_save();
xfs_stop_block_reaping(mp);
xfs_blockgc_stop(mp);
xfs_save_resvblks(mp);
xfs_quiesce_attr(mp);
ret = xfs_sync_sb(mp, true);
......@@ -960,7 +960,7 @@ xfs_fs_unfreeze(
xfs_restore_resvblks(mp);
xfs_log_work_queue(mp);
xfs_start_block_reaping(mp);
xfs_blockgc_start(mp);
return 0;
}
......@@ -1714,7 +1714,7 @@ xfs_remount_rw(
xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
return error;
}
xfs_start_block_reaping(mp);
xfs_blockgc_start(mp);
/* Create the per-AG metadata reservation pool .*/
error = xfs_fs_reserve_ag_blocks(mp);
......@@ -1734,7 +1734,7 @@ xfs_remount_ro(
* Cancel background eofb scanning so it cannot race with the final
* log force+buftarg wait and deadlock the remount.
*/
xfs_stop_block_reaping(mp);
xfs_blockgc_stop(mp);
/* Get rid of any leftover CoW reservations... */
error = xfs_blockgc_free_space(mp, NULL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册