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

Commit 44e1c47d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_add_delayed_tree_ref 



This function is always called with a valid transaction handle from
where fs_info can be referenced. No functional changes.

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 fbe4801b

fs/btrfs/delayed-ref.c

+2 −2
Original line number Diff line number Diff line
@@ -709,13 +709,13 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info, 
 * to make sure the delayed ref is eventually processed before this

 * transaction commits.

 */

int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,

			       struct btrfs_trans_handle *trans,

int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes, u64 parent,

			       u64 ref_root,  int level, int action,

			       struct btrfs_delayed_extent_op *extent_op,

			       int *old_ref_mod, int *new_ref_mod)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_delayed_tree_ref *ref;

	struct btrfs_delayed_ref_head *head_ref;

	struct btrfs_delayed_ref_root *delayed_refs;

fs/btrfs/delayed-ref.h

+1 −2
Original line number Diff line number Diff line
@@ -234,8 +234,7 @@ static inline void btrfs_put_delayed_ref_head(struct btrfs_delayed_ref_head *hea 
		kmem_cache_free(btrfs_delayed_ref_head_cachep, head);

}



int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info,

			       struct btrfs_trans_handle *trans,

int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,

			       u64 bytenr, u64 num_bytes, u64 parent,

			       u64 ref_root, int level, int action,

			       struct btrfs_delayed_extent_op *extent_op,

fs/btrfs/extent-tree.c

+4 −4
Original line number Diff line number Diff line
@@ -2176,7 +2176,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
			   owner, offset, BTRFS_ADD_DELAYED_REF);



	if (owner < BTRFS_FIRST_FREE_OBJECTID) {

		ret = btrfs_add_delayed_tree_ref(fs_info, trans, bytenr,

		ret = btrfs_add_delayed_tree_ref(trans, bytenr,

						 num_bytes, parent,

						 root_objectid, (int)owner,

						 BTRFS_ADD_DELAYED_REF, NULL,
@@ -7196,7 +7196,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
				   root->root_key.objectid,

				   btrfs_header_level(buf), 0,

				   BTRFS_DROP_DELAYED_REF);

		ret = btrfs_add_delayed_tree_ref(fs_info, trans, buf->start,

		ret = btrfs_add_delayed_tree_ref(trans, buf->start,

						 buf->len, parent,

						 root->root_key.objectid,

						 btrfs_header_level(buf),
@@ -7275,7 +7275,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, 
		old_ref_mod = new_ref_mod = 0;

		ret = 0;

	} else if (owner < BTRFS_FIRST_FREE_OBJECTID) {

		ret = btrfs_add_delayed_tree_ref(fs_info, trans, bytenr,

		ret = btrfs_add_delayed_tree_ref(trans, bytenr,

						 num_bytes, parent,

						 root_objectid, (int)owner,

						 BTRFS_DROP_DELAYED_REF, NULL,
@@ -8491,7 +8491,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, 
		btrfs_ref_tree_mod(root, ins.objectid, ins.offset, parent,

				   root_objectid, level, 0,

				   BTRFS_ADD_DELAYED_EXTENT);

		ret = btrfs_add_delayed_tree_ref(fs_info, trans, ins.objectid,

		ret = btrfs_add_delayed_tree_ref(trans, ins.objectid,

						 ins.offset, parent,

						 root_objectid, level,

						 BTRFS_ADD_DELAYED_EXTENT,