Commit c2bbc0ba authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: scrub: remove scrub_ctx::csum_list member 



Since the rework of scrub introduced by commit 2af2aaf9 ("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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6822b3f7

fs/btrfs/scrub.c

+0 −14
Original line number Diff line number Diff line
@@ -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;