Skip to content

Commit 7547080

Browse files
committed
btrfs-progs: remove fs_info parameter from btrfs_create_tree()
The @fs_info parameter can be easily extracted from @trans, and kernel has already remove the parameter. Signed-off-by: Qu Wenruo <[email protected]>
1 parent b570b64 commit 7547080

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

kernel-shared/disk-io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2369,12 +2369,12 @@ int btrfs_delete_and_free_root(struct btrfs_trans_handle *trans,
23692369
}
23702370

23712371
struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
2372-
struct btrfs_fs_info *fs_info,
23732372
struct btrfs_key *key)
23742373
{
2375-
struct extent_buffer *leaf;
2374+
struct btrfs_fs_info *fs_info = trans->fs_info;
23762375
struct btrfs_root *tree_root = fs_info->tree_root;
23772376
struct btrfs_root *root;
2377+
struct extent_buffer *leaf;
23782378
int ret = 0;
23792379

23802380
root = kzalloc(sizeof(*root), GFP_KERNEL);

kernel-shared/disk-io.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ int write_tree_block(struct btrfs_trans_handle *trans,
239239
struct extent_buffer *eb);
240240
int btrfs_fs_roots_compare_roots(const struct rb_node *node1, const struct rb_node *node2);
241241
struct btrfs_root *btrfs_create_tree(struct btrfs_trans_handle *trans,
242-
struct btrfs_fs_info *fs_info,
243242
struct btrfs_key *key);
244243
int btrfs_delete_and_free_root(struct btrfs_trans_handle *trans,
245244
struct btrfs_root *root);

kernel-shared/free-space-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)
15161516
if (IS_ERR(trans))
15171517
return PTR_ERR(trans);
15181518

1519-
free_space_root = btrfs_create_tree(trans, fs_info, &root_key);
1519+
free_space_root = btrfs_create_tree(trans, &root_key);
15201520
if (IS_ERR(free_space_root)) {
15211521
ret = PTR_ERR(free_space_root);
15221522
goto abort;

mkfs/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ static int create_data_reloc_tree(struct btrfs_trans_handle *trans)
748748
char *name = "..";
749749
int ret;
750750

751-
root = btrfs_create_tree(trans, fs_info, &key);
751+
root = btrfs_create_tree(trans, &key);
752752
if (IS_ERR(root)) {
753753
ret = PTR_ERR(root);
754754
goto out;
@@ -870,7 +870,7 @@ static int create_uuid_tree(struct btrfs_trans_handle *trans)
870870
int ret = 0;
871871

872872
UASSERT(fs_info->uuid_root == NULL);
873-
root = btrfs_create_tree(trans, fs_info, &key);
873+
root = btrfs_create_tree(trans, &key);
874874
if (IS_ERR(root)) {
875875
ret = PTR_ERR(root);
876876
goto out;
@@ -900,7 +900,7 @@ static int create_global_root(struct btrfs_trans_handle *trans, u64 objectid,
900900
};
901901
int ret = 0;
902902

903-
root = btrfs_create_tree(trans, fs_info, &key);
903+
root = btrfs_create_tree(trans, &key);
904904
if (IS_ERR(root)) {
905905
ret = PTR_ERR(root);
906906
goto out;
@@ -1127,7 +1127,7 @@ static int setup_raid_stripe_tree_root(struct btrfs_fs_info *fs_info)
11271127
return ret;
11281128
}
11291129

1130-
stripe_root = btrfs_create_tree(trans, fs_info, &key);
1130+
stripe_root = btrfs_create_tree(trans, &key);
11311131
if (IS_ERR(stripe_root)) {
11321132
ret = PTR_ERR(stripe_root);
11331133
btrfs_abort_transaction(trans, ret);

0 commit comments

Comments
 (0)