---

yaml --- r: 349163 b: refs/heads/master c: 3268a24 h: refs/heads/master i: 349161: fd73d5f 349159: 5013b3b v: v3
git-mirror · Jan 14, 2013 · e723618 · e723618
1 parent 4c34266
commit e723618
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac5c93005b7073732e268606688fb6c821d5310e
+refs/heads/master: 3268a2468eb6a31af89930cbae58a62fe6ca6d2d
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -6788,11 +6788,13 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
 						       &wc->flags[level]);
 			if (ret < 0) {
 				btrfs_tree_unlock_rw(eb, path->locks[level]);
+				path->locks[level] = 0;
 				return ret;
 			}
 			BUG_ON(wc->refs[level] == 0);
 			if (wc->refs[level] == 1) {
 				btrfs_tree_unlock_rw(eb, path->locks[level]);
+				path->locks[level] = 0;
 				return 1;
 			}
 		}