diff options
author | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-03-25 10:52:48 -0700 |
commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/tree-log.c | |
parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (diff) | |
parent | a4f3d2c4efe2628329249b64fd5799468e025b9d (diff) | |
download | op-kernel-dev-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.zip op-kernel-dev-fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb.tar.gz |
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r-- | fs/btrfs/tree-log.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index c5b8ba3..066e754 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -2230,7 +2230,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, if (trans) { btrfs_tree_lock(next); btrfs_set_lock_blocking(next); - clean_tree_block(trans, root, next); + clean_tree_block(trans, root->fs_info, + next); btrfs_wait_tree_block_writeback(next); btrfs_tree_unlock(next); } @@ -2308,7 +2309,8 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans, if (trans) { btrfs_tree_lock(next); btrfs_set_lock_blocking(next); - clean_tree_block(trans, root, next); + clean_tree_block(trans, root->fs_info, + next); btrfs_wait_tree_block_writeback(next); btrfs_tree_unlock(next); } @@ -2384,7 +2386,7 @@ static int walk_log_tree(struct btrfs_trans_handle *trans, if (trans) { btrfs_tree_lock(next); btrfs_set_lock_blocking(next); - clean_tree_block(trans, log, next); + clean_tree_block(trans, log->fs_info, next); btrfs_wait_tree_block_writeback(next); btrfs_tree_unlock(next); } |