RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-07 17:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check: Remove root argument from finish_current_insert

Browse Source 
Just reference it directly from trans->fs_info.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-05-28 09:36:43 +03:00 committed by David Sterba
parent cb2939c345
commit 64419cbf05
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
extent-tree.c
View File

@ -54,8 +54,7 @@ static int __free_extent(struct btrfs_trans_handle *trans,
u64 bytenr, u64 num_bytes, u64 parent, u64 bytenr, u64 num_bytes, u64 parent,
u64 root_objectid, u64 owner_objectid, u64 root_objectid, u64 owner_objectid,
u64 owner_offset, int refs_to_drop); u64 owner_offset, int refs_to_drop);
static int finish_current_insert(struct btrfs_trans_handle *trans, struct static int finish_current_insert(struct btrfs_trans_handle *trans);
btrfs_root *extent_root);
static int del_pending_extents(struct btrfs_trans_handle *trans); static int del_pending_extents(struct btrfs_trans_handle *trans);
static struct btrfs_block_group_cache * static struct btrfs_block_group_cache *
btrfs_find_block_group(struct btrfs_root *root, struct btrfs_block_group_cache btrfs_find_block_group(struct btrfs_root *root, struct btrfs_block_group_cache
@ -1421,7 +1420,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
err = ret; err = ret;
out: out:
btrfs_free_path(path); btrfs_free_path(path);
finish_current_insert(trans, root->fs_info->extent_root); finish_current_insert(trans);
del_pending_extents(trans); del_pending_extents(trans);
BUG_ON(err); BUG_ON(err);
return err; return err;
@ -1430,7 +1429,7 @@ out:
int btrfs_extent_post_op(struct btrfs_trans_handle *trans, int btrfs_extent_post_op(struct btrfs_trans_handle *trans,
struct btrfs_root *root) struct btrfs_root *root)
{ {
finish_current_insert(trans, root->fs_info->extent_root); finish_current_insert(trans);
del_pending_extents(trans); del_pending_extents(trans);
return 0; return 0;
} }
@ -1610,7 +1609,7 @@ again:
btrfs_set_extent_flags(l, item, flags); btrfs_set_extent_flags(l, item, flags);
out: out:
btrfs_free_path(path); btrfs_free_path(path);
finish_current_insert(trans, root->fs_info->extent_root); finish_current_insert(trans);
del_pending_extents(trans); del_pending_extents(trans);
return ret; return ret;
} }
@ -1726,7 +1725,7 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
btrfs_mark_buffer_dirty(leaf); btrfs_mark_buffer_dirty(leaf);
btrfs_release_path(path); btrfs_release_path(path);
fail: fail:
finish_current_insert(trans, extent_root); finish_current_insert(trans);
pending_ret = del_pending_extents(trans); pending_ret = del_pending_extents(trans);
if (ret) if (ret)
return ret; return ret;
@ -2056,13 +2055,13 @@ static int extent_root_pending_ops(struct btrfs_fs_info *info)
return ret == 0; return ret == 0;
} }
static int finish_current_insert(struct btrfs_trans_handle *trans, static int finish_current_insert(struct btrfs_trans_handle *trans)
struct btrfs_root *extent_root)
{ {
u64 start; u64 start;
u64 end; u64 end;
u64 priv; u64 priv;
struct btrfs_fs_info *info = extent_root->fs_info; struct btrfs_fs_info *info = trans->fs_info;
struct btrfs_root *extent_root = info->extent_root;
struct pending_extent_op *extent_op; struct pending_extent_op *extent_op;
struct btrfs_key key; struct btrfs_key key;
int ret; int ret;
@ -2388,7 +2387,7 @@ static int __free_extent(struct btrfs_trans_handle *trans,
} }
fail: fail:
btrfs_free_path(path); btrfs_free_path(path);
finish_current_insert(trans, extent_root); finish_current_insert(trans);
return ret; return ret;
} }
@ -2789,7 +2788,7 @@ static int alloc_tree_block(struct btrfs_trans_handle *trans,
ret = alloc_reserved_tree_block(trans, root, root_objectid, ret = alloc_reserved_tree_block(trans, root, root_objectid,
generation, flags, generation, flags,
key, level, ins); key, level, ins);
finish_current_insert(trans, root->fs_info->extent_root); finish_current_insert(trans);
del_pending_extents(trans); del_pending_extents(trans);
} }
return ret; return ret;
@ -3316,7 +3315,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans,
sizeof(cache->item)); sizeof(cache->item));
BUG_ON(ret); BUG_ON(ret);
ret = finish_current_insert(trans, extent_root); ret = finish_current_insert(trans);
BUG_ON(ret); BUG_ON(ret);
ret = del_pending_extents(trans); ret = del_pending_extents(trans);
BUG_ON(ret); BUG_ON(ret);
@ -3416,7 +3415,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
sizeof(cache->item)); sizeof(cache->item));
BUG_ON(ret); BUG_ON(ret);
finish_current_insert(trans, extent_root); finish_current_insert(trans);
ret = del_pending_extents(trans); ret = del_pending_extents(trans);
BUG_ON(ret); BUG_ON(ret);
@ -3802,7 +3801,7 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans)
struct btrfs_root *root = fs_info->extent_root; struct btrfs_root *root = fs_info->extent_root;
while(extent_root_pending_ops(fs_info)) { while(extent_root_pending_ops(fs_info)) {
ret = finish_current_insert(trans, root); ret = finish_current_insert(trans);
if (ret) if (ret)
return ret; return ret;
ret = del_pending_extents(trans); ret = del_pending_extents(trans);