diff options
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r-- | fs/btrfs/scrub.c | 26 |
1 files changed, 23 insertions, 3 deletions
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) | |||
2662 | kfree(sparity); | 2662 | kfree(sparity); |
2663 | } | 2663 | } |
2664 | 2664 | ||
2665 | static void scrub_parity_bio_endio_worker(struct btrfs_work *work) | ||
2666 | { | ||
2667 | struct scrub_parity *sparity = container_of(work, struct scrub_parity, | ||
2668 | work); | ||
2669 | struct scrub_ctx *sctx = sparity->sctx; | ||
2670 | |||
2671 | scrub_free_parity(sparity); | ||
2672 | scrub_pending_bio_dec(sctx); | ||
2673 | } | ||
2674 | |||
2665 | static void scrub_parity_bio_endio(struct bio *bio, int error) | 2675 | static void scrub_parity_bio_endio(struct bio *bio, int error) |
2666 | { | 2676 | { |
2667 | struct scrub_parity *sparity = (struct scrub_parity *)bio->bi_private; | 2677 | struct scrub_parity *sparity = (struct scrub_parity *)bio->bi_private; |
2668 | struct scrub_ctx *sctx = sparity->sctx; | ||
2669 | 2678 | ||
2670 | if (error) | 2679 | if (error) |
2671 | bitmap_or(sparity->ebitmap, sparity->ebitmap, sparity->dbitmap, | 2680 | bitmap_or(sparity->ebitmap, sparity->ebitmap, sparity->dbitmap, |
2672 | sparity->nsectors); | 2681 | sparity->nsectors); |
2673 | 2682 | ||
2674 | scrub_free_parity(sparity); | ||
2675 | scrub_pending_bio_dec(sctx); | ||
2676 | bio_put(bio); | 2683 | bio_put(bio); |
2684 | |||
2685 | btrfs_init_work(&sparity->work, btrfs_scrubparity_helper, | ||
2686 | scrub_parity_bio_endio_worker, NULL, NULL); | ||
2687 | btrfs_queue_work(sparity->sctx->dev_root->fs_info->scrub_parity_workers, | ||
2688 | &sparity->work); | ||
2677 | } | 2689 | } |
2678 | 2690 | ||
2679 | static void scrub_parity_check_and_repair(struct scrub_parity *sparity) | 2691 | 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, | |||
3589 | ret = -ENOMEM; | 3601 | ret = -ENOMEM; |
3590 | goto out; | 3602 | goto out; |
3591 | } | 3603 | } |
3604 | fs_info->scrub_parity_workers = | ||
3605 | btrfs_alloc_workqueue("btrfs-scrubparity", flags, | ||
3606 | max_active, 2); | ||
3607 | if (!fs_info->scrub_parity_workers) { | ||
3608 | ret = -ENOMEM; | ||
3609 | goto out; | ||
3610 | } | ||
3592 | } | 3611 | } |
3593 | ++fs_info->scrub_workers_refcnt; | 3612 | ++fs_info->scrub_workers_refcnt; |
3594 | out: | 3613 | out: |
@@ -3601,6 +3620,7 @@ static noinline_for_stack void scrub_workers_put(struct btrfs_fs_info *fs_info) | |||
3601 | btrfs_destroy_workqueue(fs_info->scrub_workers); | 3620 | btrfs_destroy_workqueue(fs_info->scrub_workers); |
3602 | btrfs_destroy_workqueue(fs_info->scrub_wr_completion_workers); | 3621 | btrfs_destroy_workqueue(fs_info->scrub_wr_completion_workers); |
3603 | btrfs_destroy_workqueue(fs_info->scrub_nocow_workers); | 3622 | btrfs_destroy_workqueue(fs_info->scrub_nocow_workers); |
3623 | btrfs_destroy_workqueue(fs_info->scrub_parity_workers); | ||
3604 | } | 3624 | } |
3605 | WARN_ON(fs_info->scrub_workers_refcnt < 0); | 3625 | WARN_ON(fs_info->scrub_workers_refcnt < 0); |
3606 | } | 3626 | } |