---

yaml --- r: 299818 b: refs/heads/master c: 1daf354 h: refs/heads/master v: v3
git-mirror · Apr 27, 2012 · a7059c2 · a7059c2
1 parent 097bfa2
commit a7059c2
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: 3e74317ad773ba9df36db1fa32848cba41ac4d1a
+refs/heads/master: 1daf3540fa77faea2f91d96bcaf07ce48ee827be
diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c
@@ -1279,7 +1279,9 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
 		if (rb_node)
 			backref_tree_panic(rb_node, -EEXIST, node->bytenr);
 	} else {
+		spin_lock(&root->fs_info->trans_lock);
 		list_del_init(&root->root_list);
+		spin_unlock(&root->fs_info->trans_lock);
 		kfree(node);
 	}
 	return 0;