openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: rename block gc start and stop functions 

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: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2021-01-22 16:48:44 -08:00
parent 419567534e
commit c9a6526fe7
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/scrub/common.c
View File

@ -888,7 +888,7 @@ xchk_stop_reaping(
struct xfs_scrub *sc) struct xfs_scrub *sc)
{ {
sc->flags |= XCHK_REAPING_DISABLED; sc->flags |= XCHK_REAPING_DISABLED;
xfs_stop_block_reaping(sc->mp); xfs_blockgc_stop(sc->mp);
} }
/* Restart background reaping of resources. */ /* Restart background reaping of resources. */
@ -896,6 +896,6 @@ void
xchk_start_reaping( xchk_start_reaping(
struct xfs_scrub *sc) struct xfs_scrub *sc)
{ {
xfs_start_block_reaping(sc->mp); xfs_blockgc_start(sc->mp);
sc->flags &= ~XCHK_REAPING_DISABLED; sc->flags &= ~XCHK_REAPING_DISABLED;
} }

4
fs/xfs/xfs_icache.c
View File

@ -1557,7 +1557,7 @@ xfs_inode_clear_cowblocks_tag(
/* Disable post-EOF and CoW block auto-reclamation. */ /* Disable post-EOF and CoW block auto-reclamation. */
void void
xfs_stop_block_reaping( xfs_blockgc_stop(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
cancel_delayed_work_sync(&mp->m_blockgc_work); cancel_delayed_work_sync(&mp->m_blockgc_work);
@ -1565,7 +1565,7 @@ xfs_stop_block_reaping(
/* Enable post-EOF and CoW block auto-reclamation. */ /* Enable post-EOF and CoW block auto-reclamation. */
void void
xfs_start_block_reaping( xfs_blockgc_start(
struct xfs_mount *mp) struct xfs_mount *mp)
{ {
xfs_blockgc_queue(mp); xfs_blockgc_queue(mp);

4
fs/xfs/xfs_icache.h
View File

@ -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, int xfs_icache_inode_is_allocated(struct xfs_mount *mp, struct xfs_trans *tp,
xfs_ino_t ino, bool *inuse); xfs_ino_t ino, bool *inuse);
void xfs_stop_block_reaping(struct xfs_mount *mp); void xfs_blockgc_stop(struct xfs_mount *mp);
void xfs_start_block_reaping(struct xfs_mount *mp); void xfs_blockgc_start(struct xfs_mount *mp);
#endif #endif

2
fs/xfs/xfs_mount.c
View File

@ -1054,7 +1054,7 @@ xfs_unmountfs(
uint64_t resblks; uint64_t resblks;
int error; int error;
xfs_stop_block_reaping(mp); xfs_blockgc_stop(mp);
xfs_fs_unreserve_ag_blocks(mp); xfs_fs_unreserve_ag_blocks(mp);
xfs_qm_unmount_quotas(mp); xfs_qm_unmount_quotas(mp);
xfs_rtunmount_inodes(mp); xfs_rtunmount_inodes(mp);

8
fs/xfs/xfs_super.c
View File

@ -891,7 +891,7 @@ xfs_fs_freeze(
* set a GFP_NOFS context here to avoid recursion deadlocks. * set a GFP_NOFS context here to avoid recursion deadlocks.
*/ */
flags = memalloc_nofs_save(); flags = memalloc_nofs_save();
xfs_stop_block_reaping(mp); xfs_blockgc_stop(mp);
xfs_save_resvblks(mp); xfs_save_resvblks(mp);
ret = xfs_log_quiesce(mp); ret = xfs_log_quiesce(mp);
memalloc_nofs_restore(flags); memalloc_nofs_restore(flags);
@ -906,7 +906,7 @@ xfs_fs_unfreeze(
xfs_restore_resvblks(mp); xfs_restore_resvblks(mp);
xfs_log_work_queue(mp); xfs_log_work_queue(mp);
xfs_start_block_reaping(mp); xfs_blockgc_start(mp);
return 0; return 0;
} }
@ -1690,7 +1690,7 @@ xfs_remount_rw(
xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
return error; return error;
} }
xfs_start_block_reaping(mp); xfs_blockgc_start(mp);
/* Create the per-AG metadata reservation pool .*/ /* Create the per-AG metadata reservation pool .*/
error = xfs_fs_reserve_ag_blocks(mp); error = xfs_fs_reserve_ag_blocks(mp);
@ -1710,7 +1710,7 @@ xfs_remount_ro(
* Cancel background eofb scanning so it cannot race with the final * Cancel background eofb scanning so it cannot race with the final
* log force+buftarg wait and deadlock the remount. * log force+buftarg wait and deadlock the remount.
*/ */
xfs_stop_block_reaping(mp); xfs_blockgc_stop(mp);
/* Get rid of any leftover CoW reservations... */ /* Get rid of any leftover CoW reservations... */
error = xfs_blockgc_free_space(mp, NULL); error = xfs_blockgc_free_space(mp, NULL);