From bc411f398dfba6da572beeb9d7e5391c82529b85 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.cz>
Date: Mon, 13 Jun 2011 17:54:22 +0000
Subject: [PATCH] --- yaml --- r: 253815 b: refs/heads/master c:
 3ed4498caf381a73d6259d3ffacc914b17a507ec h: refs/heads/master i:   253813:
 d7eb6fa8f448fc57d4d6935435ba6ffe29a9af37   253811:
 a681b40ca290eb4c870bb0421141e2e5e1edb970   253807:
 dda7050e0d880f3adc08ba9b6a7aecdcd0b8430f v: v3

---
 [refs]                    | 2 +-
 trunk/fs/btrfs/tree-log.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 487d84ba4deb..7dc8b6e8674a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e038dca803423bb7a3fa9a162b7dcc225efe9bf9
+refs/heads/master: 3ed4498caf381a73d6259d3ffacc914b17a507ec
diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c
index 592396c6dc47..4ce8a9f41d1e 100644
--- a/trunk/fs/btrfs/tree-log.c
+++ b/trunk/fs/btrfs/tree-log.c
@@ -3177,7 +3177,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
 		tmp_key.offset = (u64)-1;
 
 		wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key);
-		BUG_ON(!wc.replay_dest);
+		BUG_ON(IS_ERR_OR_NULL(wc.replay_dest));
 
 		wc.replay_dest->log_root = log;
 		btrfs_record_root_in_trans(trans, wc.replay_dest);