From bff1e02c7fa926df86c3a754a0c82b75dcdcea23 Mon Sep 17 00:00:00 2001
From: Liu Bo <bo.li.liu@oracle.com>
Date: Mon, 4 Mar 2013 16:25:36 +0000
Subject: [PATCH] --- yaml --- r: 361001 b: refs/heads/master c:
 8f71f3e0e4fb5a2445fb93d3057a33aefc4aa30d h: refs/heads/master i:   360999:
 ad5c3197927cbc9be2a613521633c2f579bd1cf0 v: v3

---
 [refs]                      | 2 +-
 trunk/fs/btrfs/relocation.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7843a784b5ff..7c9d1d0412fd 100644
--- 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
index ba5a3210da9a..16e0c6fbdbed 100644
--- 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) {