Commit e66f0bb1 authored by Qu Wenruo's avatar Qu Wenruo Committed by Josef Bacik
Browse files

btrfs: Replace fs_info->cache_workers workqueue with btrfs_workqueue. 



Replace the fs_info->cache_workers with the newly created
btrfs_workqueue.

Signed-off-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Tested-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
parent d05a33ac

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ struct btrfs_caching_control { 
	struct list_head list;

	struct mutex mutex;

	wait_queue_head_t wait;

	struct btrfs_work work;

	struct btrfs_work_struct work;

	struct btrfs_block_group_cache *block_group;

	u64 progress;

	atomic_t count;
@@ -1516,7 +1516,7 @@ struct btrfs_fs_info { 
	struct btrfs_workqueue_struct *endio_write_workers;

	struct btrfs_workqueue_struct *endio_freespace_worker;

	struct btrfs_workqueue_struct *submit_workers;

	struct btrfs_workers caching_workers;

	struct btrfs_workqueue_struct *caching_workers;

	struct btrfs_workers readahead_workers;



	/*

fs/btrfs/disk-io.c

+5 −5
Original line number Diff line number Diff line
@@ -2007,7 +2007,7 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info) 
	btrfs_destroy_workqueue(fs_info->endio_freespace_worker);

	btrfs_destroy_workqueue(fs_info->submit_workers);

	btrfs_stop_workers(&fs_info->delayed_workers);

	btrfs_stop_workers(&fs_info->caching_workers);

	btrfs_destroy_workqueue(fs_info->caching_workers);

	btrfs_stop_workers(&fs_info->readahead_workers);

	btrfs_destroy_workqueue(fs_info->flush_workers);

	btrfs_stop_workers(&fs_info->qgroup_rescan_workers);
@@ -2485,8 +2485,8 @@ int open_ctree(struct super_block *sb, 
	fs_info->flush_workers =

		btrfs_alloc_workqueue("flush_delalloc", flags, max_active, 0);



	btrfs_init_workers(&fs_info->caching_workers, "cache",

			   fs_info->thread_pool_size, NULL);

	fs_info->caching_workers =

		btrfs_alloc_workqueue("cache", flags, max_active, 0);



	/*

	 * a higher idle thresh on the submit workers makes it much more
@@ -2537,7 +2537,6 @@ int open_ctree(struct super_block *sb, 
	ret = btrfs_start_workers(&fs_info->generic_worker);

	ret |= btrfs_start_workers(&fs_info->fixup_workers);

	ret |= btrfs_start_workers(&fs_info->delayed_workers);

	ret |= btrfs_start_workers(&fs_info->caching_workers);

	ret |= btrfs_start_workers(&fs_info->readahead_workers);

	ret |= btrfs_start_workers(&fs_info->qgroup_rescan_workers);

	if (ret) {
@@ -2549,7 +2548,8 @@ int open_ctree(struct super_block *sb, 
	      fs_info->endio_workers && fs_info->endio_meta_workers &&

	      fs_info->endio_meta_write_workers &&

	      fs_info->endio_write_workers && fs_info->endio_raid56_workers &&

	      fs_info->endio_freespace_worker && fs_info->rmw_workers)) {

	      fs_info->endio_freespace_worker && fs_info->rmw_workers &&

	      fs_info->caching_workers)) {

		err = -ENOMEM;

		goto fail_sb_buffer;

	}

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static u64 add_new_free_space(struct btrfs_block_group_cache *block_group, 
	return total_added;

}



static noinline void caching_thread(struct btrfs_work *work)

static noinline void caching_thread(struct btrfs_work_struct *work)

{

	struct btrfs_block_group_cache *block_group;

	struct btrfs_fs_info *fs_info;
@@ -549,7 +549,7 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, 
	caching_ctl->block_group = cache;

	caching_ctl->progress = cache->key.objectid;

	atomic_set(&caching_ctl->count, 1);

	caching_ctl->work.func = caching_thread;

	btrfs_init_work(&caching_ctl->work, caching_thread, NULL, NULL);



	spin_lock(&cache->lock);

	/*
@@ -640,7 +640,7 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, 


	btrfs_get_block_group(cache);



	btrfs_queue_worker(&fs_info->caching_workers, &caching_ctl->work);

	btrfs_queue_work(fs_info->caching_workers, &caching_ctl->work);



	return ret;

}

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info, 
	btrfs_workqueue_set_max(fs_info->workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->delalloc_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->submit_workers, new_pool_size);

	btrfs_set_max_workers(&fs_info->caching_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->caching_workers, new_pool_size);

	btrfs_set_max_workers(&fs_info->fixup_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->endio_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->endio_meta_workers, new_pool_size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE