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

Commit ed4f255b authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: delayed-ref: Use btrfs_ref to refactor btrfs_add_delayed_tree_ref() 



btrfs_add_delayed_tree_ref() has a longer and longer parameter list, and
some callers like btrfs_inc_extent_ref() are using @owner as level for
delayed tree ref.

Instead of making the parameter list longer, use btrfs_ref to refactor
it, so each parameter assignment should be self-explaining without dirty
level/owner trick, and provides the basis for later refactoring.

Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent dd28b6a5

fs/btrfs/delayed-ref.c

+17 −7
Original line number Diff line number Diff line
@@ -735,8 +735,7 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info, 
 * transaction commits.

 */

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_ref *generic_ref,

			       struct btrfs_delayed_extent_op *extent_op,

			       int *old_ref_mod, int *new_ref_mod)

{
@@ -746,10 +745,18 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
	struct btrfs_delayed_ref_root *delayed_refs;

	struct btrfs_qgroup_extent_record *record = NULL;

	int qrecord_inserted;

	bool is_system = (ref_root == BTRFS_CHUNK_TREE_OBJECTID);

	bool is_system;

	int action = generic_ref->action;

	int level = generic_ref->tree_ref.level;

	int ret;

	u64 bytenr = generic_ref->bytenr;

	u64 num_bytes = generic_ref->len;

	u64 parent = generic_ref->parent;

	u8 ref_type;



	is_system = (generic_ref->real_root == BTRFS_CHUNK_TREE_OBJECTID);



	ASSERT(generic_ref->type == BTRFS_REF_METADATA && generic_ref->action);

	BUG_ON(extent_op && extent_op->is_data);

	ref = kmem_cache_alloc(btrfs_delayed_tree_ref_cachep, GFP_NOFS);

	if (!ref)
@@ -762,7 +769,9 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
	}



	if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) &&

	    is_fstree(ref_root)) {

	    is_fstree(generic_ref->real_root) &&

	    is_fstree(generic_ref->tree_ref.root) &&

	    !generic_ref->skip_qgroup) {

		record = kzalloc(sizeof(*record), GFP_NOFS);

		if (!record) {

			kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
@@ -777,13 +786,14 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, 
		ref_type = BTRFS_TREE_BLOCK_REF_KEY;



	init_delayed_ref_common(fs_info, &ref->node, bytenr, num_bytes,

				ref_root, action, ref_type);

	ref->root = ref_root;

				generic_ref->tree_ref.root, action, ref_type);

	ref->root = generic_ref->tree_ref.root;

	ref->parent = parent;

	ref->level = level;



	init_delayed_ref_head(head_ref, record, bytenr, num_bytes,

			      ref_root, 0, action, false, is_system);

			      generic_ref->tree_ref.root, 0, action, false,

			      is_system);

	head_ref->extent_op = extent_op;



	delayed_refs = &trans->transaction->delayed_refs;

fs/btrfs/delayed-ref.h

+1 −2
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ static inline void btrfs_put_delayed_ref_head(struct btrfs_delayed_ref_head *hea 
}



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_ref *generic_ref,

			       struct btrfs_delayed_extent_op *extent_op,

			       int *old_ref_mod, int *new_ref_mod);

int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,

fs/btrfs/extent-tree.c

+26 −18
Original line number Diff line number Diff line
@@ -2047,6 +2047,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
			 u64 root_objectid, u64 owner, u64 offset)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_ref generic_ref = { 0 };

	int old_ref_mod, new_ref_mod;

	int ret;
@@ -2056,12 +2057,13 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, 
	btrfs_ref_tree_mod(root, bytenr, num_bytes, parent, root_objectid,

			   owner, offset, BTRFS_ADD_DELAYED_REF);



	btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_REF, bytenr,

			       num_bytes, parent);

	generic_ref.real_root = root->root_key.objectid;

	if (owner < BTRFS_FIRST_FREE_OBJECTID) {

		ret = btrfs_add_delayed_tree_ref(trans, bytenr,

						 num_bytes, parent,

						 root_objectid, (int)owner,

						 BTRFS_ADD_DELAYED_REF, NULL,

						 &old_ref_mod, &new_ref_mod);

		btrfs_init_tree_ref(&generic_ref, (int)owner, root_objectid);

		ret = btrfs_add_delayed_tree_ref(trans, &generic_ref,

				NULL, &old_ref_mod, &new_ref_mod);

	} else {

		ret = btrfs_add_delayed_data_ref(trans, bytenr,

						 num_bytes, parent,
@@ -7176,9 +7178,15 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, 
			   u64 parent, int last_ref)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_ref generic_ref = { 0 };

	int pin = 1;

	int ret;



	btrfs_init_generic_ref(&generic_ref, BTRFS_DROP_DELAYED_REF,

			       buf->start, buf->len, parent);

	btrfs_init_tree_ref(&generic_ref, btrfs_header_level(buf),

			    root->root_key.objectid);



	if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {

		int old_ref_mod, new_ref_mod;
@@ -7186,11 +7194,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(trans, buf->start,

						 buf->len, parent,

						 root->root_key.objectid,

						 btrfs_header_level(buf),

						 BTRFS_DROP_DELAYED_REF, NULL,

		ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, NULL,

						 &old_ref_mod, &new_ref_mod);

		BUG_ON(ret); /* -ENOMEM */

		pin = old_ref_mod >= 0 && new_ref_mod < 0;
@@ -7242,6 +7246,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, 
		      u64 owner, u64 offset)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_ref generic_ref = { 0 };

	int old_ref_mod, new_ref_mod;

	int ret;
@@ -7253,6 +7258,9 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, 
				   root_objectid, owner, offset,

				   BTRFS_DROP_DELAYED_REF);



	btrfs_init_generic_ref(&generic_ref, BTRFS_DROP_DELAYED_REF, bytenr,

			       num_bytes, parent);

	generic_ref.real_root = root->root_key.objectid;

	/*

	 * tree log blocks never actually go into the extent allocation

	 * tree, just update pinning info and exit early.
@@ -7264,10 +7272,8 @@ 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(trans, bytenr,

						 num_bytes, parent,

						 root_objectid, (int)owner,

						 BTRFS_DROP_DELAYED_REF, NULL,

		btrfs_init_tree_ref(&generic_ref, (int)owner, root_objectid);

		ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, NULL,

						 &old_ref_mod, &new_ref_mod);

	} else {

		ret = btrfs_add_delayed_data_ref(trans, bytenr,
@@ -8583,6 +8589,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, 
	struct btrfs_block_rsv *block_rsv;

	struct extent_buffer *buf;

	struct btrfs_delayed_extent_op *extent_op;

	struct btrfs_ref generic_ref = { 0 };

	u64 flags = 0;

	int ret;

	u32 blocksize = fs_info->nodesize;
@@ -8640,10 +8647,11 @@ 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(trans, ins.objectid,

						 ins.offset, parent,

						 root_objectid, level,

						 BTRFS_ADD_DELAYED_EXTENT,

		btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT,

				       ins.objectid, ins.offset, parent);

		generic_ref.real_root = root->root_key.objectid;

		btrfs_init_tree_ref(&generic_ref, level, root_objectid);

		ret = btrfs_add_delayed_tree_ref(trans, &generic_ref,

						 extent_op, NULL, NULL);

		if (ret)

			goto out_free_delayed;