---

yaml --- r: 361001 b: refs/heads/master c: 8f71f3e h: refs/heads/master i: 360999: ad5c319 v: v3
git-mirror · Mar 4, 2013 · bff1e02 · bff1e02
1 parent c5bd9bf
commit bff1e02
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: 00d71c9c17b1fd28fa54f323a29a0e23c6d3de40
+refs/heads/master: 8f71f3e0e4fb5a2445fb93d3057a33aefc4aa30d
diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c
@@ -1269,6 +1269,8 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
 	}
 	spin_unlock(&rc->reloc_root_tree.lock);
 
+	if (!node)
+		return 0;
 	BUG_ON((struct btrfs_root *)node->data != root);
 
 	if (!del) {