Commit 71528e9e authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: get rid of extent_io_tree::dirty_bytes 



This was used as an optimization for count_range_bits(EXTENT_DIRTY),
which was used by the failed record code.  However this was removed in
this series by patch "btrfs: convert the io_failure_tree to a plain
rb_tree" which was the last user of this optimization.  Remove the
->dirty_bytes as nobody cares anymore.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4374d03d

fs/btrfs/extent-io-tree.c

+1 −16
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ void extent_io_tree_init(struct btrfs_fs_info *fs_info, 
{

	tree->fs_info = fs_info;

	tree->state = RB_ROOT;

	tree->dirty_bytes = 0;

	spin_lock_init(&tree->lock);

	tree->private_data = private_data;

	tree->owner = owner;
@@ -378,10 +377,6 @@ static void set_state_bits(struct extent_io_tree *tree, 
	if (tree->private_data && is_data_inode(tree->private_data))

		btrfs_set_delalloc_extent(tree->private_data, state, bits);



	if ((bits_to_set & EXTENT_DIRTY) && !(state->state & EXTENT_DIRTY)) {

		u64 range = state->end - state->start + 1;

		tree->dirty_bytes += range;

	}

	ret = add_extent_changeset(state, bits_to_set, changeset, 1);

	BUG_ON(ret < 0);

	state->state |= bits_to_set;
@@ -515,12 +510,6 @@ static struct extent_state *clear_state_bit(struct extent_io_tree *tree, 
	u32 bits_to_clear = bits & ~EXTENT_CTLBITS;

	int ret;



	if ((bits_to_clear & EXTENT_DIRTY) && (state->state & EXTENT_DIRTY)) {

		u64 range = state->end - state->start + 1;

		WARN_ON(range > tree->dirty_bytes);

		tree->dirty_bytes -= range;

	}



	if (tree->private_data && is_data_inode(tree->private_data))

		btrfs_clear_delalloc_extent(tree->private_data, state, bits);
@@ -1515,10 +1504,7 @@ u64 count_range_bits(struct extent_io_tree *tree, 
		return 0;



	spin_lock(&tree->lock);

	if (cur_start == 0 && bits == EXTENT_DIRTY) {

		total_bytes = tree->dirty_bytes;

		goto out;

	}



	/*

	 * This search will find all the extents that end after our range

	 * starts.
@@ -1544,7 +1530,6 @@ u64 count_range_bits(struct extent_io_tree *tree, 
		}

		state = next_state(state);

	}

out:

	spin_unlock(&tree->lock);

	return total_bytes;

}

fs/btrfs/extent-io-tree.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct extent_io_tree { 
	struct rb_root state;

	struct btrfs_fs_info *fs_info;

	void *private_data;

	u64 dirty_bytes;



	/* Who owns this io tree, should be one of IO_TREE_* */

	u8 owner;