marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Remove root argument from btrfs_set_block_flags 

It's used only to get a reference to fs_info, which can be obtained from
the transaction handle.

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>
master
Nikolay Borisov 2018-05-28 09:36:48 +03:00 committed by David Sterba
parent a22b593587
commit 2d99e810d9
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctree.c
View File

@ -236,7 +236,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
BUG_ON(ret); BUG_ON(ret);
} }
if (new_flags != 0) { if (new_flags != 0) {
ret = btrfs_set_block_flags(trans, root, buf->start, ret = btrfs_set_block_flags(trans, buf->start,
btrfs_header_level(buf), btrfs_header_level(buf),
new_flags); new_flags);
BUG_ON(ret); BUG_ON(ret);

5
ctree.h
View File

@ -2519,9 +2519,8 @@ struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans, int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytenr, struct btrfs_fs_info *fs_info, u64 bytenr,
u64 offset, int metadata, u64 *refs, u64 *flags); u64 offset, int metadata, u64 *refs, u64 *flags);
int btrfs_set_block_flags(struct btrfs_trans_handle *trans, int btrfs_set_block_flags(struct btrfs_trans_handle *trans, u64 bytenr,
struct btrfs_root *root, int level, u64 flags);
u64 bytenr, int level, u64 flags);
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
struct extent_buffer *buf, int record_parent); struct extent_buffer *buf, int record_parent);
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

22
extent-tree.c
View File

@ -1529,18 +1529,17 @@ out:
return ret; return ret;
} }
int btrfs_set_block_flags(struct btrfs_trans_handle *trans, int btrfs_set_block_flags(struct btrfs_trans_handle *trans, u64 bytenr,
struct btrfs_root *root, int level, u64 flags)
u64 bytenr, int level, u64 flags)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_path *path; struct btrfs_path *path;
int ret; int ret;
struct btrfs_key key; struct btrfs_key key;
struct extent_buffer *l; struct extent_buffer *l;
struct btrfs_extent_item *item; struct btrfs_extent_item *item;
u32 item_size; u32 item_size;
int skinny_metadata = int skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
btrfs_fs_incompat(root->fs_info, SKINNY_METADATA);
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) if (!path)
@ -1552,13 +1551,12 @@ int btrfs_set_block_flags(struct btrfs_trans_handle *trans,
key.offset = level; key.offset = level;
key.type = BTRFS_METADATA_ITEM_KEY; key.type = BTRFS_METADATA_ITEM_KEY;
} else { } else {
key.offset = root->fs_info->nodesize; key.offset = fs_info->nodesize;
key.type = BTRFS_EXTENT_ITEM_KEY; key.type = BTRFS_EXTENT_ITEM_KEY;
} }
again: again:
ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path, ret = btrfs_search_slot(trans, fs_info->extent_root, &key, path, 0, 0);
0, 0);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -1569,13 +1567,13 @@ again:
btrfs_item_key_to_cpu(path->nodes[0], &key, btrfs_item_key_to_cpu(path->nodes[0], &key,
path->slots[0]); path->slots[0]);
if (key.objectid == bytenr && if (key.objectid == bytenr &&
key.offset == root->fs_info->nodesize && key.offset == fs_info->nodesize &&
key.type == BTRFS_EXTENT_ITEM_KEY) key.type == BTRFS_EXTENT_ITEM_KEY)
ret = 0; ret = 0;
} }
if (ret) { if (ret) {
btrfs_release_path(path); btrfs_release_path(path);
key.offset = root->fs_info->nodesize; key.offset = fs_info->nodesize;
key.type = BTRFS_EXTENT_ITEM_KEY; key.type = BTRFS_EXTENT_ITEM_KEY;
goto again; goto again;
} }
@ -1591,8 +1589,8 @@ again:
item_size = btrfs_item_size_nr(l, path->slots[0]); item_size = btrfs_item_size_nr(l, path->slots[0]);
#ifdef BTRFS_COMPAT_EXTENT_TREE_V0 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
if (item_size < sizeof(*item)) { if (item_size < sizeof(*item)) {
ret = convert_extent_item_v0(trans, root->fs_info->extent_root, ret = convert_extent_item_v0(trans, fs_info->extent_root, path,
path, (u64)-1, 0); (u64)-1, 0);
if (ret < 0) if (ret < 0)
goto out; goto out;