diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 13:54:42 -0700 |
| commit | e55d4fa96762fd767a3b6d842c904e994db6bb2e (patch) | |
| tree | c74157e01cb128cb97f106a50cfadc4c8b872c41 /fs/btrfs/tree-log.c | |
| parent | e32c14667e4fe9f16ac9b918d15d29abd2315a55 (diff) | |
| parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
Merge commit 'v3.0-rc5' into android-3.0
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 592396c6dc4..4ce8a9f41d1 100644 --- 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); |