Commit 3fef46fc authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

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: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 383e32b0

Documentation/admin-guide/xfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -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.

================  ===========

fs/xfs/xfs_icache.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

fs/xfs/xfs_super.c

+4 −4
Original line number Diff line number Diff line
@@ -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);