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>

diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index 8ea6d4a..53456f3 100644 (file)
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -888,7 +888,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. */
@@ -896,6 +896,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;
 }

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 0c0d577..35c7355 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -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);

diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
index 5c57476..d1fddb1 100644 (file)
--- a/fs/xfs/xfs_icache.h
+++ b/fs/xfs/xfs_icache.h
@@ -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

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 53b8cca..be9ce11 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1054,7 +1054,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);

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 471592e..ea94208 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -891,7 +891,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);
        ret = xfs_log_quiesce(mp);
        memalloc_nofs_restore(flags);
@@ -906,7 +906,7 @@ xfs_fs_unfreeze(
 
        xfs_restore_resvblks(mp);
        xfs_log_work_queue(mp);
-       xfs_start_block_reaping(mp);
+       xfs_blockgc_start(mp);
        return 0;
 }
 
@@ -1690,7 +1690,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);
@@ -1710,7 +1710,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);