---

yaml --- r: 139024 b: refs/heads/master c: cf47b8f h: refs/heads/master v: v3
git-mirror · Jan 15, 2009 · b831437 · b831437
1 parent 4343640
commit b831437
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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;
 }