From b831437a34ccfec36f828bdf256358c2c82dcee3 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Wed, 14 Jan 2009 13:40:46 -0500
Subject: [PATCH] --- yaml --- r: 139024 b: refs/heads/master c:
 cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/fs/btrfs/locking.c | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 904fce93dc48..19d2213b0324 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac6e60ee405aa3bf718f7fe4cb01b7ee0b8877ec
+refs/heads/master: cf47b8f3d96b0b8b10b557444a28b3ca4024ff82
diff --git a/trunk/fs/btrfs/locking.c b/trunk/fs/btrfs/locking.c
index 39bae7761db6..40ba8e8962f8 100644
--- a/trunk/fs/btrfs/locking.c
+++ b/trunk/fs/btrfs/locking.c
@@ -37,16 +37,6 @@
 
 int btrfs_tree_lock(struct extent_buffer *eb)
 {
-	int i;
-
-	if (mutex_trylock(&eb->mutex))
-		return 0;
-	for (i = 0; i < 512; i++) {
-		cpu_relax();
-		if (mutex_trylock(&eb->mutex))
-			return 0;
-	}
-	cpu_relax();
 	mutex_lock_nested(&eb->mutex, BTRFS_MAX_LEVEL - btrfs_header_level(eb));
 	return 0;
 }