diff options
| author | Liu Bo <liubo2009@cn.fujitsu.com> | 2012-02-16 18:34:38 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2012-02-16 17:23:17 +0100 |
| commit | 9d47c7671dc555e198c7347a173ed37316e0c4c1 (patch) | |
| tree | 4a24af02762bf4eb05f936dd8f210430fefc9d17 /fs/btrfs/extent_io.c | |
| parent | 0449314a9cc5a7fb0bd42e2175a3c46f68f3a2b0 (diff) | |
| download | linux-9d47c7671dc555e198c7347a173ed37316e0c4c1.tar.gz linux-9d47c7671dc555e198c7347a173ed37316e0c4c1.tar.bz2 linux-9d47c7671dc555e198c7347a173ed37316e0c4c1.zip | |
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: Liu Bo <liubo2009@cn.fujitsu.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index fe14285b53f1..37259ff5cd71 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -966,8 +966,6 @@ hit_next: 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; @@ -1012,7 +1010,6 @@ hit_next: 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; @@ -1073,8 +1070,6 @@ hit_next: set_state_bits(tree, prealloc, &bits); clear_state_bit(tree, prealloc, &clear_bits, 0); - - merge_state(tree, prealloc); prealloc = NULL; goto out; } |