Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dcdbe01 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info argument from alloc_reserved_tree_block 



This function already takes a transaction handle which contains a
reference to the fs_info. So use this and remove the extra argument.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 315b76b4

fs/btrfs/extent-tree.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -66,7 +66,6 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
				      u64 flags, u64 owner, u64 offset,

				      u64 flags, u64 owner, u64 offset,

				      struct btrfs_key *ins, int ref_mod);

				      struct btrfs_key *ins, int ref_mod);

static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,

static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,

				     struct btrfs_fs_info *fs_info,

				     u64 parent, u64 root_objectid,

				     u64 parent, u64 root_objectid,

				     u64 flags, struct btrfs_disk_key *key,

				     u64 flags, struct btrfs_disk_key *key,

				     int level, struct btrfs_key *ins);

				     int level, struct btrfs_key *ins);
@@ -2461,8 +2460,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans, 
	}

	}

	if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) {

	if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) {

		BUG_ON(!extent_op || !extent_op->update_flags);

		BUG_ON(!extent_op || !extent_op->update_flags);

		ret = alloc_reserved_tree_block(trans, fs_info,

		ret = alloc_reserved_tree_block(trans, parent, ref_root,

						parent, ref_root,

						extent_op->flags_to_set,

						extent_op->flags_to_set,

						&extent_op->key,

						&extent_op->key,

						ref->level, &ins);

						ref->level, &ins);
@@ -8146,11 +8144,11 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
}

}





static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,

static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,

				     struct btrfs_fs_info *fs_info,

				     u64 parent, u64 root_objectid,

				     u64 parent, u64 root_objectid,

				     u64 flags, struct btrfs_disk_key *key,

				     u64 flags, struct btrfs_disk_key *key,

				     int level, struct btrfs_key *ins)

				     int level, struct btrfs_key *ins)

{

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int ret;

	int ret;

	struct btrfs_extent_item *extent_item;

	struct btrfs_extent_item *extent_item;

	struct btrfs_tree_block_info *block_info;

	struct btrfs_tree_block_info *block_info;