Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c204c96 authored by Zhao Lei's avatar Zhao Lei Committed by Chris Mason
Browse files

btrfs: Remove noused chunk_tree and chunk_objectid from scrub_enumerate_chunks and scrub_chunk 



These variables are not used from introduced version, remove them.

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 7955323b

fs/btrfs/scrub.c

+2 −8
Original line number Diff line number Diff line
@@ -3493,7 +3493,6 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, 


static noinline_for_stack int scrub_chunk(struct scrub_ctx *sctx,

					  struct btrfs_device *scrub_dev,

					  u64 chunk_tree, u64 chunk_objectid,

					  u64 chunk_offset, u64 length,

					  u64 dev_offset, int is_dev_replace)

{
@@ -3544,8 +3543,6 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, 
	struct btrfs_root *root = sctx->dev_root;

	struct btrfs_fs_info *fs_info = root->fs_info;

	u64 length;

	u64 chunk_tree;

	u64 chunk_objectid;

	u64 chunk_offset;

	int ret = 0;

	int slot;
@@ -3609,8 +3606,6 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, 
		if (found_key.offset + length <= start)

			goto skip;



		chunk_tree = btrfs_dev_extent_chunk_tree(l, dev_extent);

		chunk_objectid = btrfs_dev_extent_chunk_objectid(l, dev_extent);

		chunk_offset = btrfs_dev_extent_chunk_offset(l, dev_extent);



		/*
@@ -3643,9 +3638,8 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx, 
		dev_replace->cursor_right = found_key.offset + length;

		dev_replace->cursor_left = found_key.offset;

		dev_replace->item_needs_writeback = 1;

		ret = scrub_chunk(sctx, scrub_dev, chunk_tree, chunk_objectid,

				  chunk_offset, length, found_key.offset,

				  is_dev_replace);

		ret = scrub_chunk(sctx, scrub_dev, chunk_offset, length,

				  found_key.offset, is_dev_replace);



		/*

		 * flush, submit all pending read and write bios, afterwards