diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 11:58:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-20 11:58:53 -0400 |
| commit | 90a800de0a29426ea900ecd53f2929d5f4bc4578 (patch) | |
| tree | 22b4ec6119e438c73d695522042669b601672579 /fs/btrfs/tree-log.c | |
| parent | 10e18e62309a882c513b4f516527055b6a60d668 (diff) | |
| parent | e999376f094162aa425ae749aa1df95ab928d010 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: avoid delayed metadata items during commits
btrfs: fix uninitialized return value
btrfs: fix wrong reservation when doing delayed inode operations
btrfs: Remove unused sysfs code
btrfs: fix dereference of ERR_PTR value
Btrfs: fix relocation races
Btrfs: set no_trans_join after trying to expand the transaction
Btrfs: protect the pending_snapshots list with trans_lock
Btrfs: fix path leakage on subvol deletion
Btrfs: drop the delalloc_bytes check in shrink_delalloc
Btrfs: check the return value from set_anon_super
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 592396c6dc47..4ce8a9f41d1e 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
| @@ -3177,7 +3177,7 @@ again: | |||
| 3177 | tmp_key.offset = (u64)-1; | 3177 | tmp_key.offset = (u64)-1; |
| 3178 | 3178 | ||
| 3179 | wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key); | 3179 | wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key); |
| 3180 | BUG_ON(!wc.replay_dest); | 3180 | BUG_ON(IS_ERR_OR_NULL(wc.replay_dest)); |
| 3181 | 3181 | ||
| 3182 | wc.replay_dest->log_root = log; | 3182 | wc.replay_dest->log_root = log; |
| 3183 | btrfs_record_root_in_trans(trans, wc.replay_dest); | 3183 | btrfs_record_root_in_trans(trans, wc.replay_dest); |