git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
fs
/
btrfs
/
tree-log.c
diff --git
a/fs/btrfs/tree-log.c
b/fs/btrfs/tree-log.c
index
592396c
..
4ce8a9f
100644
(file)
--- a/
fs/btrfs/tree-log.c
+++ b/
fs/btrfs/tree-log.c
@@
-3177,7
+3177,7
@@
again:
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);