From b4b3a0adb50b373022e7601116fea00e189a2f3a Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Thu, 16 Feb 2012 18:34:38 +0800 Subject: [PATCH] --- yaml --- r: 287896 b: refs/heads/master c: 9d47c7671dc555e198c7347a173ed37316e0c4c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent_io.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0ff7f11b429e..087222d97750 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0449314a9cc5a7fb0bd42e2175a3c46f68f3a2b0 +refs/heads/master: 9d47c7671dc555e198c7347a173ed37316e0c4c1 diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c index fe14285b53f1..37259ff5cd71 100644 --- a/trunk/fs/btrfs/extent_io.c +++ b/trunk/fs/btrfs/extent_io.c @@ -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; @@ -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; @@ -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; }