From: Liu Bo <liubo2009@cn.fujitsu.com>
Date: Thu, 16 Feb 2012 10:34:38 +0000 (+0800)
Subject: Btrfs: kick out redundant stuff in convert_extent_bit
X-Git-Tag: v3.3-rc7~3^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d47c7671dc555e198c7347a173ed37316e0c4c1;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index fe14285..37259ff 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;
 	}