diff options
Diffstat (limited to 'fs')
-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: | |||
966 | 966 | ||
967 | set_state_bits(tree, state, &bits); | 967 | set_state_bits(tree, state, &bits); |
968 | clear_state_bit(tree, state, &clear_bits, 0); | 968 | clear_state_bit(tree, state, &clear_bits, 0); |
969 | |||
970 | merge_state(tree, state); | ||
971 | if (last_end == (u64)-1) | 969 | if (last_end == (u64)-1) |
972 | goto out; | 970 | goto out; |
973 | 971 | ||
@@ -1012,7 +1010,6 @@ hit_next: | |||
1012 | if (state->end <= end) { | 1010 | if (state->end <= end) { |
1013 | set_state_bits(tree, state, &bits); | 1011 | set_state_bits(tree, state, &bits); |
1014 | clear_state_bit(tree, state, &clear_bits, 0); | 1012 | clear_state_bit(tree, state, &clear_bits, 0); |
1015 | merge_state(tree, state); | ||
1016 | if (last_end == (u64)-1) | 1013 | if (last_end == (u64)-1) |
1017 | goto out; | 1014 | goto out; |
1018 | start = last_end + 1; | 1015 | start = last_end + 1; |
@@ -1073,8 +1070,6 @@ hit_next: | |||
1073 | 1070 | ||
1074 | set_state_bits(tree, prealloc, &bits); | 1071 | set_state_bits(tree, prealloc, &bits); |
1075 | clear_state_bit(tree, prealloc, &clear_bits, 0); | 1072 | clear_state_bit(tree, prealloc, &clear_bits, 0); |
1076 | |||
1077 | merge_state(tree, prealloc); | ||
1078 | prealloc = NULL; | 1073 | prealloc = NULL; |
1079 | goto out; | 1074 | goto out; |
1080 | } | 1075 | } |