From 30bd556646c48027d1d9e1129c7e6a2c4ea736a8 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Thu, 14 Jul 2011 03:19:27 +0000
Subject: [PATCH] --- yaml --- r: 262251 b: refs/heads/master c:
 ded91f0814a349e36b3ca0eff497f816ad518fba h: refs/heads/master i:   262249:
 714f0cc398524e8095da6c053e61bebc4b85d30b   262247:
 7877a3c9d7c2d26adcd8ef36733e9257af3d7145 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/btrfs/extent_io.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 52764ad813ed..4a0d9246d596 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3150b6996934455d7f2da243939d80a9b839085a
+refs/heads/master: ded91f0814a349e36b3ca0eff497f816ad518fba
diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c
index 0d69425d0197..a0811e639f58 100644
--- a/trunk/fs/btrfs/extent_io.c
+++ b/trunk/fs/btrfs/extent_io.c
@@ -648,11 +648,7 @@ int wait_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits)
 		if (start > end)
 			break;
 
-		if (need_resched()) {
-			spin_unlock(&tree->lock);
-			cond_resched();
-			spin_lock(&tree->lock);
-		}
+		cond_resched_lock(&tree->lock);
 	}
 out:
 	spin_unlock(&tree->lock);