---

yaml --- r: 253815 b: refs/heads/master c: 3ed4498 h: refs/heads/master i: 253813: d7eb6fa 253811: a681b40 253807: dda7050 v: v3
git-mirror · Jun 17, 2011 · bc411f3 · bc411f3
1 parent 0331346
commit bc411f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);