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

Commit 61da2abf authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_alloc_logged_file_extent 



It can be referenced from trans since the function is always called
within a valid transaction.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 87cc7a8a

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -2676,7 +2676,6 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
				     u64 offset, u64 ram_bytes,

				     struct btrfs_key *ins);

int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,

				   struct btrfs_fs_info *fs_info,

				   u64 root_objectid, u64 owner, u64 offset,

				   struct btrfs_key *ins);

int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes, u64 num_bytes,

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -8263,10 +8263,10 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
 * space cache bits as well

 */

int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,

				   struct btrfs_fs_info *fs_info,

				   u64 root_objectid, u64 owner, u64 offset,

				   struct btrfs_key *ins)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int ret;

	struct btrfs_block_group_cache *block_group;

	struct btrfs_space_info *space_info;

fs/btrfs/tree-log.c

+0 −1
Original line number Diff line number Diff line
@@ -715,7 +715,6 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, 
				 * allocation tree

				 */

				ret = btrfs_alloc_logged_file_extent(trans,

						fs_info,

						root->root_key.objectid,

						key->objectid, offset, &ins);

				if (ret)