From: David Sterba <dsterba@suse.com>
Date: Fri, 31 Mar 2017 16:42:57 +0000 (+0200)
Subject: btrfs: scrub: simplify scrub worker initialization
X-Git-Tag: Ubuntu-5.10.0-12.13~9477^2~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=af1cbe0a66cb9e6c3f2acf7f0a7fc647b5dc4f2f;p=mirror_ubuntu-hirsute-kernel.git

btrfs: scrub: simplify scrub worker initialization

Minor simplification, merge calls to one.

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

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index a1b29d581dca..7c9c82bb6255 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -4015,14 +4015,8 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info,
 	int max_active = fs_info->thread_pool_size;
 
 	if (fs_info->scrub_workers_refcnt == 0) {
-		if (is_dev_replace)
-			fs_info->scrub_workers =
-				btrfs_alloc_workqueue(fs_info, "scrub", flags,
-						      1, 4);
-		else
-			fs_info->scrub_workers =
-				btrfs_alloc_workqueue(fs_info, "scrub", flags,
-						      max_active, 4);
+		fs_info->scrub_workers = btrfs_alloc_workqueue(fs_info, "scrub",
+				flags, is_dev_replace ? 1 : max_active, 4);
 		if (!fs_info->scrub_workers)
 			goto fail_scrub_workers;