diff --git a/[refs] b/[refs] index a8e65ef3547a..d84aeaa742d1 100644 --- 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 index 017281dbb2a7..5a105a086acf 100644 --- 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;