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

Commit 9d47c767 authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: kick out redundant stuff in convert_extent_bit 



clear_state_bit will do merge_state for us, so kick out the redundant one.

Signed-off-by: default avatarLiu Bo <liubo2009@cn.fujitsu.com>
parent 0449314a

fs/btrfs/extent_io.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -966,8 +966,6 @@ hit_next: 




		set_state_bits(tree, state, &bits);

		set_state_bits(tree, state, &bits);

		clear_state_bit(tree, state, &clear_bits, 0);

		clear_state_bit(tree, state, &clear_bits, 0);



		merge_state(tree, state);

		if (last_end == (u64)-1)

		if (last_end == (u64)-1)

			goto out;

			goto out;
@@ -1012,7 +1010,6 @@ hit_next: 
		if (state->end <= end) {

		if (state->end <= end) {

			set_state_bits(tree, state, &bits);

			set_state_bits(tree, state, &bits);

			clear_state_bit(tree, state, &clear_bits, 0);

			clear_state_bit(tree, state, &clear_bits, 0);

			merge_state(tree, state);

			if (last_end == (u64)-1)

			if (last_end == (u64)-1)

				goto out;

				goto out;

			start = last_end + 1;

			start = last_end + 1;
@@ -1073,8 +1070,6 @@ hit_next: 




		set_state_bits(tree, prealloc, &bits);

		set_state_bits(tree, prealloc, &bits);

		clear_state_bit(tree, prealloc, &clear_bits, 0);

		clear_state_bit(tree, prealloc, &clear_bits, 0);



		merge_state(tree, prealloc);

		prealloc = NULL;

		prealloc = NULL;

		goto out;

		goto out;

	}

	}