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

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

btrfs: Use init_delayed_ref_common in add_delayed_data_ref 



Use the newly introduced helper and remove the duplicate code.  No
functional changes.

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 646f4dd7

fs/btrfs/delayed-ref.c

+10 −25
Original line number Diff line number Diff line
@@ -750,41 +750,26 @@ add_delayed_data_ref(struct btrfs_trans_handle *trans, 
{

	struct btrfs_delayed_data_ref *full_ref;

	struct btrfs_delayed_ref_root *delayed_refs;

	u64 seq = 0;

	u8 ref_type;

	int ret;



	if (action == BTRFS_ADD_DELAYED_EXTENT)

		action = BTRFS_ADD_DELAYED_REF;



	delayed_refs = &trans->transaction->delayed_refs;



	if (is_fstree(ref_root))

		seq = atomic64_read(&trans->fs_info->tree_mod_seq);



	/* first set the basic ref node struct up */

	refcount_set(&ref->refs, 1);

	ref->bytenr = bytenr;

	ref->num_bytes = num_bytes;

	ref->ref_mod = 1;

	ref->action = action;

	ref->is_head = 0;

	ref->in_tree = 1;

	ref->seq = seq;

	RB_CLEAR_NODE(&ref->ref_node);

	INIT_LIST_HEAD(&ref->add_list);



	full_ref = btrfs_delayed_node_to_data_ref(ref);

	full_ref->parent = parent;

	full_ref->root = ref_root;

	if (parent)

		ref->type = BTRFS_SHARED_DATA_REF_KEY;

	        ref_type = BTRFS_SHARED_DATA_REF_KEY;

	else

		ref->type = BTRFS_EXTENT_DATA_REF_KEY;

	        ref_type = BTRFS_EXTENT_DATA_REF_KEY;



	init_delayed_ref_common(trans->fs_info, ref, bytenr, num_bytes,

				ref_root, action, ref_type);

	full_ref->root = ref_root;

	full_ref->parent = parent;

	full_ref->objectid = owner;

	full_ref->offset = offset;



	trace_add_delayed_data_ref(trans->fs_info, ref, full_ref, action);

	trace_add_delayed_data_ref(trans->fs_info, ref, full_ref,

				   action == BTRFS_ADD_DELAYED_EXTENT ?

				   BTRFS_ADD_DELAYED_REF : action);



	ret = insert_delayed_ref(trans, delayed_refs, head_ref, ref);

	if (ret > 0)