android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: Remove fs_info argument from switch_commit_roots

Browse Source 
We already have the fs_info from the passed transaction so use it
directly. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-02-07 17:55:47 +02:00 committed by David Sterba
parent 97cb39bb91
commit 16916a88d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/transaction.c
View File

@ -126,9 +126,9 @@ static void clear_btree_io_tree(struct extent_io_tree *tree)
spin_unlock(&tree->lock); spin_unlock(&tree->lock);
} }
static noinline void switch_commit_roots(struct btrfs_transaction *trans, static noinline void switch_commit_roots(struct btrfs_transaction *trans)
struct btrfs_fs_info *fs_info)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_root *root, *tmp; struct btrfs_root *root, *tmp;
down_write(&fs_info->commit_root_sem); down_write(&fs_info->commit_root_sem);
@ -1406,7 +1406,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
ret = commit_cowonly_roots(trans); ret = commit_cowonly_roots(trans);
if (ret) if (ret)
goto out; goto out;
switch_commit_roots(trans->transaction, fs_info); switch_commit_roots(trans->transaction);
ret = btrfs_write_and_wait_transaction(trans, fs_info); ret = btrfs_write_and_wait_transaction(trans, fs_info);
if (ret) if (ret)
btrfs_handle_fs_error(fs_info, ret, btrfs_handle_fs_error(fs_info, ret,
@ -2234,7 +2234,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
list_add_tail(&fs_info->chunk_root->dirty_list, list_add_tail(&fs_info->chunk_root->dirty_list,
&cur_trans->switch_commits); &cur_trans->switch_commits);
switch_commit_roots(cur_trans, fs_info); switch_commit_roots(cur_trans);
ASSERT(list_empty(&cur_trans->dirty_bgs)); ASSERT(list_empty(&cur_trans->dirty_bgs));
ASSERT(list_empty(&cur_trans->io_bgs)); ASSERT(list_empty(&cur_trans->io_bgs));