---

yaml --- r: 262251 b: refs/heads/master c: ded91f0 h: refs/heads/master i: 262249: 714f0cc 262247: 7877a3c v: v3
git-mirror · Aug 1, 2011 · 30bd556 · 30bd556
1 parent 5543a61
commit 30bd556
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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);