Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a458198 authored by Eric Sandeen's avatar Eric Sandeen Committed by David Sterba
Browse files

btrfs: factor btrfs_init_workqueues() out of open_ctree() 



Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
[renamed to btrfs_init_workqueues]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent f9e92e40

fs/btrfs/disk-io.c

+83 −70
Original line number Original line Diff line number Diff line
@@ -2223,6 +2223,86 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) 
	mutex_init(&fs_info->qgroup_rescan_lock);

	mutex_init(&fs_info->qgroup_rescan_lock);

}

}





static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info,

		struct btrfs_fs_devices *fs_devices)

{

	int max_active = fs_info->thread_pool_size;

	int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND;



	fs_info->workers =

		btrfs_alloc_workqueue("worker", flags | WQ_HIGHPRI,

				      max_active, 16);



	fs_info->delalloc_workers =

		btrfs_alloc_workqueue("delalloc", flags, max_active, 2);



	fs_info->flush_workers =

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



	fs_info->caching_workers =

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



	/*

	 * a higher idle thresh on the submit workers makes it much more

	 * likely that bios will be send down in a sane order to the

	 * devices

	 */

	fs_info->submit_workers =

		btrfs_alloc_workqueue("submit", flags,

				      min_t(u64, fs_devices->num_devices,

					    max_active), 64);



	fs_info->fixup_workers =

		btrfs_alloc_workqueue("fixup", flags, 1, 0);



	/*

	 * endios are largely parallel and should have a very

	 * low idle thresh

	 */

	fs_info->endio_workers =

		btrfs_alloc_workqueue("endio", flags, max_active, 4);

	fs_info->endio_meta_workers =

		btrfs_alloc_workqueue("endio-meta", flags, max_active, 4);

	fs_info->endio_meta_write_workers =

		btrfs_alloc_workqueue("endio-meta-write", flags, max_active, 2);

	fs_info->endio_raid56_workers =

		btrfs_alloc_workqueue("endio-raid56", flags, max_active, 4);

	fs_info->endio_repair_workers =

		btrfs_alloc_workqueue("endio-repair", flags, 1, 0);

	fs_info->rmw_workers =

		btrfs_alloc_workqueue("rmw", flags, max_active, 2);

	fs_info->endio_write_workers =

		btrfs_alloc_workqueue("endio-write", flags, max_active, 2);

	fs_info->endio_freespace_worker =

		btrfs_alloc_workqueue("freespace-write", flags, max_active, 0);

	fs_info->delayed_workers =

		btrfs_alloc_workqueue("delayed-meta", flags, max_active, 0);

	fs_info->readahead_workers =

		btrfs_alloc_workqueue("readahead", flags, max_active, 2);

	fs_info->qgroup_rescan_workers =

		btrfs_alloc_workqueue("qgroup-rescan", flags, 1, 0);

	fs_info->extent_workers =

		btrfs_alloc_workqueue("extent-refs", flags,

				      min_t(u64, fs_devices->num_devices,

					    max_active), 8);



	if (!(fs_info->workers && fs_info->delalloc_workers &&

	      fs_info->submit_workers && fs_info->flush_workers &&

	      fs_info->endio_workers && fs_info->endio_meta_workers &&

	      fs_info->endio_meta_write_workers &&

	      fs_info->endio_repair_workers &&

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

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

	      fs_info->caching_workers && fs_info->readahead_workers &&

	      fs_info->fixup_workers && fs_info->delayed_workers &&

	      fs_info->extent_workers &&

	      fs_info->qgroup_rescan_workers)) {

		return -ENOMEM;

	}



	return 0;

}



int open_ctree(struct super_block *sb,

int open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

	       struct btrfs_fs_devices *fs_devices,

	       char *options)

	       char *options)
@@ -2249,7 +2329,6 @@ int open_ctree(struct super_block *sb, 
	int num_backups_tried = 0;

	int num_backups_tried = 0;

	int backup_index = 0;

	int backup_index = 0;

	int max_active;

	int max_active;

	int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND;

	bool create_uuid_tree;

	bool create_uuid_tree;

	bool check_uuid_tree;

	bool check_uuid_tree;
@@ -2581,75 +2660,9 @@ int open_ctree(struct super_block *sb, 




	max_active = fs_info->thread_pool_size;

	max_active = fs_info->thread_pool_size;





	fs_info->workers =

	ret = btrfs_init_workqueues(fs_info, fs_devices);

		btrfs_alloc_workqueue("worker", flags | WQ_HIGHPRI,

	if (ret) {

				      max_active, 16);

		err = ret;



	fs_info->delalloc_workers =

		btrfs_alloc_workqueue("delalloc", flags, max_active, 2);



	fs_info->flush_workers =

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



	fs_info->caching_workers =

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



	/*

	 * a higher idle thresh on the submit workers makes it much more

	 * likely that bios will be send down in a sane order to the

	 * devices

	 */

	fs_info->submit_workers =

		btrfs_alloc_workqueue("submit", flags,

				      min_t(u64, fs_devices->num_devices,

					    max_active), 64);



	fs_info->fixup_workers =

		btrfs_alloc_workqueue("fixup", flags, 1, 0);



	/*

	 * endios are largely parallel and should have a very

	 * low idle thresh

	 */

	fs_info->endio_workers =

		btrfs_alloc_workqueue("endio", flags, max_active, 4);

	fs_info->endio_meta_workers =

		btrfs_alloc_workqueue("endio-meta", flags, max_active, 4);

	fs_info->endio_meta_write_workers =

		btrfs_alloc_workqueue("endio-meta-write", flags, max_active, 2);

	fs_info->endio_raid56_workers =

		btrfs_alloc_workqueue("endio-raid56", flags, max_active, 4);

	fs_info->endio_repair_workers =

		btrfs_alloc_workqueue("endio-repair", flags, 1, 0);

	fs_info->rmw_workers =

		btrfs_alloc_workqueue("rmw", flags, max_active, 2);

	fs_info->endio_write_workers =

		btrfs_alloc_workqueue("endio-write", flags, max_active, 2);

	fs_info->endio_freespace_worker =

		btrfs_alloc_workqueue("freespace-write", flags, max_active, 0);

	fs_info->delayed_workers =

		btrfs_alloc_workqueue("delayed-meta", flags, max_active, 0);

	fs_info->readahead_workers =

		btrfs_alloc_workqueue("readahead", flags, max_active, 2);

	fs_info->qgroup_rescan_workers =

		btrfs_alloc_workqueue("qgroup-rescan", flags, 1, 0);

	fs_info->extent_workers =

		btrfs_alloc_workqueue("extent-refs", flags,

				      min_t(u64, fs_devices->num_devices,

					    max_active), 8);



	if (!(fs_info->workers && fs_info->delalloc_workers &&

	      fs_info->submit_workers && fs_info->flush_workers &&

	      fs_info->endio_workers && fs_info->endio_meta_workers &&

	      fs_info->endio_meta_write_workers &&

	      fs_info->endio_repair_workers &&

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

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

	      fs_info->caching_workers && fs_info->readahead_workers &&

	      fs_info->fixup_workers && fs_info->delayed_workers &&

	      fs_info->extent_workers &&

	      fs_info->qgroup_rescan_workers)) {

		err = -ENOMEM;

		goto fail_sb_buffer;

		goto fail_sb_buffer;

	}

	}