From: Christoph Hellwig <hch@lst.de>

Date: Tue, 28 Mar 2023 12:56:13 +0900

Subject: [PATCH] btrfs: restore the thread_pool= behavior in remount for the

 end I/O workqueues

References: bsc#1012628

Patch-mainline: 6.2.12

Git-commit: 40fac6472f22a59f5694496e179988ab4a1dfe07

commit 40fac6472f22a59f5694496e179988ab4a1dfe07 upstream.

Commit d7b9416fe5c5 ("btrfs: remove btrfs_end_io_wq") converted the read

and I/O handling from btrfs_workqueues to Linux workqueues, and as part

of that lost the code to apply the thread_pool= based max_active limit

on remount.  Restore it.

Fixes: d7b9416fe5c5 ("btrfs: remove btrfs_end_io_wq")

CC: stable@vger.kernel.org # 6.0+

Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: David Sterba <dsterba@suse.com>

Signed-off-by: David Sterba <dsterba@suse.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 fs/btrfs/super.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c

index 433ce221..8dd8f56b 100644

--- a/fs/btrfs/super.c

+++ b/fs/btrfs/super.c

@@ -1630,6 +1630,8 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info,

 	btrfs_workqueue_set_max(fs_info->hipri_workers, new_pool_size);

 	btrfs_workqueue_set_max(fs_info->delalloc_workers, new_pool_size);

 	btrfs_workqueue_set_max(fs_info->caching_workers, new_pool_size);

+	workqueue_set_max_active(fs_info->endio_workers, new_pool_size);

+	workqueue_set_max_active(fs_info->endio_meta_workers, new_pool_size);

 	btrfs_workqueue_set_max(fs_info->endio_write_workers, new_pool_size);

 	btrfs_workqueue_set_max(fs_info->endio_freespace_worker, new_pool_size);

 	btrfs_workqueue_set_max(fs_info->delayed_workers, new_pool_size);

-- 

2.35.3