---

yaml --- r: 346747 b: refs/heads/master c: 5124e00 h: refs/heads/master i: 346745: ea1e086 346743: b33c1f5 v: v3
git-mirror · Dec 17, 2012 · 921951c · 921951c
1 parent 10ee442
commit 921951c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b1c6ccadee4ea4adb98799f3430fc72e57a187f
+refs/heads/master: 5124e00ec5b0be56155a11aec416fcc5125339f1
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
@@ -2564,7 +2564,10 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
 			 * must have write locks on this node and the
 			 * parent
 			 */
-			if (level + 1 > write_lock_level) {
+			if (level > write_lock_level ||
+			    (level + 1 > write_lock_level &&
+			    level + 1 < BTRFS_MAX_LEVEL &&
+			    p->nodes[level + 1])) {
 				write_lock_level = level + 1;
 				btrfs_release_path(p);
 				goto again;