]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: scrub: remove scrub_ctx::csum_list member
authorQu Wenruo <wqu@suse.com>
Mon, 12 Jun 2023 06:14:29 +0000 (14:14 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 19 Jun 2023 11:59:40 +0000 (13:59 +0200)
Since the rework of scrub introduced by commit 2af2aaf98205 ("btrfs:
scrub: introduce structure for new BTRFS_STRIPE_LEN based interface")
and later commits, scrub no longer keeps its data checksum inside sctx.

Instead we have scrub_stripe::csums for the checksum of the stripe.
Thus we can remove the unused scrub_ctx::csum_list member.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/scrub.c

index 0cf8e2f277dae4b023794c0511ecc245c159f114..297beaefd49c83b2f8c8ecaf0f429327b78bfca8 100644 (file)
@@ -177,7 +177,6 @@ struct scrub_ctx {
        struct btrfs_fs_info    *fs_info;
        int                     first_free;
        int                     cur_stripe;
-       struct list_head        csum_list;
        atomic_t                cancel_req;
        int                     readonly;
        int                     sectors_per_bio;
@@ -309,17 +308,6 @@ static void scrub_blocked_if_needed(struct btrfs_fs_info *fs_info)
        scrub_pause_off(fs_info);
 }
 
-static void scrub_free_csums(struct scrub_ctx *sctx)
-{
-       while (!list_empty(&sctx->csum_list)) {
-               struct btrfs_ordered_sum *sum;
-               sum = list_first_entry(&sctx->csum_list,
-                                      struct btrfs_ordered_sum, list);
-               list_del(&sum->list);
-               kfree(sum);
-       }
-}
-
 static noinline_for_stack void scrub_free_ctx(struct scrub_ctx *sctx)
 {
        int i;
@@ -330,7 +318,6 @@ static noinline_for_stack void scrub_free_ctx(struct scrub_ctx *sctx)
        for (i = 0; i < SCRUB_STRIPES_PER_SCTX; i++)
                release_scrub_stripe(&sctx->stripes[i]);
 
-       scrub_free_csums(sctx);
        kfree(sctx);
 }
 
@@ -352,7 +339,6 @@ static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(
        refcount_set(&sctx->refs, 1);
        sctx->is_dev_replace = is_dev_replace;
        sctx->fs_info = fs_info;
-       INIT_LIST_HEAD(&sctx->csum_list);
        for (i = 0; i < SCRUB_STRIPES_PER_SCTX; i++) {
                int ret;