Skip to content

Commit

Permalink
Btrfs: kick out redundant stuff in convert_extent_bit
Browse files Browse the repository at this point in the history 
clear_state_bit will do merge_state for us, so kick out the redundant one.

Signed-off-by: Liu Bo <liubo2009@cn.fujitsu.com>
  • Loading branch information
Liu Bo authored and David Sterba committed Feb 16, 2012
1 parent 0449314 commit 9d47c76
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions fs/btrfs/extent_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -966,8 +966,6 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

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

merge_state(tree, state);
if (last_end == (u64)-1)
goto out;

Expand Down Expand Up @@ -1012,7 +1010,6 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
if (state->end <= end) {
set_state_bits(tree, state, &bits);
clear_state_bit(tree, state, &clear_bits, 0);
merge_state(tree, state);
if (last_end == (u64)-1)
goto out;
start = last_end + 1;
Expand Down Expand Up @@ -1073,8 +1070,6 @@ int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

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

merge_state(tree, prealloc);
prealloc = NULL;
goto out;
}
Expand Down

0 comments on commit 9d47c76

Please sign in to comment.