4 files changed, 27 insertions, 3 deletions

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index df9932b00d08..1ce06c849a86 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -85,6 +85,7 @@ BTRFS_WORK_HELPER(extent_refs_helper);
 BTRFS_WORK_HELPER(scrub_helper);
 BTRFS_WORK_HELPER(scrubwrc_helper);
 BTRFS_WORK_HELPER(scrubnc_helper);
+BTRFS_WORK_HELPER(scrubparity_helper);
 
 static struct __btrfs_workqueue *
 __btrfs_alloc_workqueue(const char *name, unsigned int flags, int max_active,
diff --git a/fs/btrfs/async-thread.h b/fs/btrfs/async-thread.h
index ec2ee477f8ba..b0b093b6afec 100644
--- a/fs/btrfs/async-thread.h
+++ b/fs/btrfs/async-thread.h
@@ -64,6 +64,8 @@ BTRFS_WORK_HELPER_PROTO(extent_refs_helper);
 BTRFS_WORK_HELPER_PROTO(scrub_helper);
 BTRFS_WORK_HELPER_PROTO(scrubwrc_helper);
 BTRFS_WORK_HELPER_PROTO(scrubnc_helper);
+BTRFS_WORK_HELPER_PROTO(scrubparity_helper);
+
 
 struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,
                                               unsigned int flags,
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 5e09834ac2ef..881549a35fca 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1698,6 +1698,7 @@ struct btrfs_fs_info {
         struct btrfs_workqueue *scrub_workers;
         struct btrfs_workqueue *scrub_wr_completion_workers;
         struct btrfs_workqueue *scrub_nocow_workers;
+        struct btrfs_workqueue *scrub_parity_workers;
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
         u32 check_integrity_print_mask;
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index ab5811545a98..9f2feabe99f2 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -2662,18 +2662,30 @@ static void scrub_free_parity(struct scrub_parity *sparity)
         kfree(sparity);
 }
 
+static void scrub_parity_bio_endio_worker(struct btrfs_work *work)
+{
+        struct scrub_parity *sparity = container_of(work, struct scrub_parity,
+                                                    work);
+        struct scrub_ctx *sctx = sparity->sctx;
+
+        scrub_free_parity(sparity);
+        scrub_pending_bio_dec(sctx);
+}
+
 static void scrub_parity_bio_endio(struct bio *bio, int error)
 {
         struct scrub_parity *sparity = (struct scrub_parity *)bio->bi_private;
-        struct scrub_ctx *sctx = sparity->sctx;
 
         if (error)
                 bitmap_or(sparity->ebitmap, sparity->ebitmap, sparity->dbitmap,
                           sparity->nsectors);
 
-        scrub_free_parity(sparity);
-        scrub_pending_bio_dec(sctx);
         bio_put(bio);
+
+        btrfs_init_work(&sparity->work, btrfs_scrubparity_helper,
+                        scrub_parity_bio_endio_worker, NULL, NULL);
+        btrfs_queue_work(sparity->sctx->dev_root->fs_info->scrub_parity_workers,
+                         &sparity->work);
 }
 
 static void scrub_parity_check_and_repair(struct scrub_parity *sparity)
@@ -3589,6 +3601,13 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info,
                         ret = -ENOMEM;
                         goto out;
                 }
+                fs_info->scrub_parity_workers =
+                        btrfs_alloc_workqueue("btrfs-scrubparity", flags,
+                                              max_active, 2);
+                if (!fs_info->scrub_parity_workers) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
         }
         ++fs_info->scrub_workers_refcnt;
 out:
@@ -3601,6 +3620,7 @@ static noinline_for_stack void scrub_workers_put(struct btrfs_fs_info *fs_info)
                 btrfs_destroy_workqueue(fs_info->scrub_workers);
                 btrfs_destroy_workqueue(fs_info->scrub_wr_completion_workers);
                 btrfs_destroy_workqueue(fs_info->scrub_nocow_workers);
+                btrfs_destroy_workqueue(fs_info->scrub_parity_workers);
         }
         WARN_ON(fs_info->scrub_workers_refcnt < 0);
 }