xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: get fs_info from trans in write_one_cache_group

Browse Source 
We can read fs_info from the transaction and can drop it from the
parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba
2019-03-20 11:57:46 +01:00
parent f9756261c2
commit 39db232dae
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/btrfs/extent-tree.c
View File

@@ -3315,10 +3315,10 @@ int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
} }
static int write_one_cache_group(struct btrfs_trans_handle *trans, static int write_one_cache_group(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info,
struct btrfs_path *path, struct btrfs_path *path,
struct btrfs_block_group_cache *cache) struct btrfs_block_group_cache *cache)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
int ret; int ret;
struct btrfs_root *extent_root = fs_info->extent_root; struct btrfs_root *extent_root = fs_info->extent_root;
unsigned long bi; unsigned long bi;
@@ -3666,8 +3666,7 @@ again:
} }
} }
if (!ret) { if (!ret) {
ret = write_one_cache_group(trans, fs_info, ret = write_one_cache_group(trans, path, cache);
path, cache);
/* /*
* Our block group might still be attached to the list * Our block group might still be attached to the list
* of new block groups in the transaction handle of some * of new block groups in the transaction handle of some
@@ -3817,8 +3816,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
} }
} }
if (!ret) { if (!ret) {
ret = write_one_cache_group(trans, fs_info, ret = write_one_cache_group(trans, path, cache);
path, cache);
/* /*
* One of the free space endio workers might have * One of the free space endio workers might have
* created a new block group while updating a free space * created a new block group while updating a free space
@@ -3835,8 +3833,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
if (ret == -ENOENT) { if (ret == -ENOENT) {
wait_event(cur_trans->writer_wait, wait_event(cur_trans->writer_wait,
atomic_read(&cur_trans->num_writers) == 1); atomic_read(&cur_trans->num_writers) == 1);
ret = write_one_cache_group(trans, fs_info, ret = write_one_cache_group(trans, path, cache);
path, cache);
} }
if (ret) if (ret)
btrfs_abort_transaction(trans, ret); btrfs_abort_transaction(trans, ret);