xfs: rename the blockgc workqueue

Since we're about to start using the blockgc workqueue to dispose of
inactivated inodes, strip the "block" prefix from the name; now it's
merely the general garbage collection (gc) workqueue.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/Documentation/admin-guide/xfs.rst b/Documentation/admin-guide/xfs.rst
index 5422407a96d7a3cfe877273d50d9e2b26ee478c9..8de008c0c5adacf0bd7c3dffb5fcd77498914fc5 100644 (file)
--- a/Documentation/admin-guide/xfs.rst
+++ b/Documentation/admin-guide/xfs.rst
@@ -522,7 +522,7 @@ and the short name of the data device.  They all can be found in:
 ================  ===========
   xfs_iwalk-$pid  Inode scans of the entire filesystem. Currently limited to
                   mount time quotacheck.
-  xfs-blockgc     Background garbage collection of disk space that have been
+  xfs-gc          Background garbage collection of disk space that have been
                   speculatively allocated beyond EOF or for staging copy on
                   write operations.
 ================  ===========

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 1d7720a0c068b75082d5b75a0ea1d082bbd5a456..e6a62f7654229c30e01950d1e644852bf974e6b1 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1335,7 +1335,7 @@ xfs_blockgc_queue(
 {
        rcu_read_lock();
        if (radix_tree_tagged(&pag->pag_ici_root, XFS_ICI_BLOCKGC_TAG))
-               queue_delayed_work(pag->pag_mount->m_blockgc_workqueue,
+               queue_delayed_work(pag->pag_mount->m_gc_workqueue,
                                   &pag->pag_blockgc_work,
                                   msecs_to_jiffies(xfs_blockgc_secs * 1000));
        rcu_read_unlock();

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 659ad95fe3e0baa912d3fb0500ca5a31bc7906b6..81829d19596e02ae7f3977f9dd42a3039efebc64 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -93,7 +93,7 @@ typedef struct xfs_mount {
        struct workqueue_struct *m_unwritten_workqueue;
        struct workqueue_struct *m_cil_workqueue;
        struct workqueue_struct *m_reclaim_workqueue;
-       struct workqueue_struct *m_blockgc_workqueue;
+       struct workqueue_struct *m_gc_workqueue;
        struct workqueue_struct *m_sync_workqueue;
 
        int                     m_bsize;        /* fs logical block size */

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index e5e0713bebcd8827afde0444bc10c862e98286dd..e774358383d6c62e242378f06adacf052341c524 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -519,10 +519,10 @@ xfs_init_mount_workqueues(
        if (!mp->m_reclaim_workqueue)
                goto out_destroy_cil;
 
-       mp->m_blockgc_workqueue = alloc_workqueue("xfs-blockgc/%s",
+       mp->m_gc_workqueue = alloc_workqueue("xfs-gc/%s",
                        WQ_SYSFS | WQ_UNBOUND | WQ_FREEZABLE | WQ_MEM_RECLAIM,
                        0, mp->m_super->s_id);
-       if (!mp->m_blockgc_workqueue)
+       if (!mp->m_gc_workqueue)
                goto out_destroy_reclaim;
 
        mp->m_sync_workqueue = alloc_workqueue("xfs-sync/%s",
@@ -533,7 +533,7 @@ xfs_init_mount_workqueues(
        return 0;
 
 out_destroy_eofb:
-       destroy_workqueue(mp->m_blockgc_workqueue);
+       destroy_workqueue(mp->m_gc_workqueue);
 out_destroy_reclaim:
        destroy_workqueue(mp->m_reclaim_workqueue);
 out_destroy_cil:
@@ -551,7 +551,7 @@ xfs_destroy_mount_workqueues(
        struct xfs_mount        *mp)
 {
        destroy_workqueue(mp->m_sync_workqueue);
-       destroy_workqueue(mp->m_blockgc_workqueue);
+       destroy_workqueue(mp->m_gc_workqueue);
        destroy_workqueue(mp->m_reclaim_workqueue);
        destroy_workqueue(mp->m_cil_workqueue);
        destroy_workqueue(mp->m_unwritten_workqueue);