[PATCH 2/8] btrfs: Use init_delayed_ref_common in add_delayed_tree_ref
From: Nikolay Borisov <hidden>
Date: 2018-03-21 08:45:17
Subsystem:
btrfs file system, filesystems (vfs and infrastructure), the rest · Maintainers:
Chris Mason, David Sterba, Alexander Viro, Christian Brauner, Linus Torvalds
Use the newly introduced common helper. No functional changes Signed-off-by: Nikolay Borisov <redacted> --- fs/btrfs/delayed-ref.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-)
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index d41d979f277b..4e009b3f0ec9 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c@@ -721,38 +721,25 @@ add_delayed_tree_ref(struct btrfs_fs_info *fs_info, { struct btrfs_delayed_tree_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; - - if (is_fstree(ref_root)) - seq = atomic64_read(&fs_info->tree_mod_seq); delayed_refs = &trans->transaction->delayed_refs; - - /* 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_tree_ref(ref); - full_ref->parent = parent; - full_ref->root = ref_root; if (parent) - ref->type = BTRFS_SHARED_BLOCK_REF_KEY; + ref_type = BTRFS_SHARED_BLOCK_REF_KEY; else - ref->type = BTRFS_TREE_BLOCK_REF_KEY; + ref_type = BTRFS_TREE_BLOCK_REF_KEY; + + init_delayed_ref_common(fs_info, ref, bytenr, num_bytes, ref_root, + action, ref_type); + full_ref->root = ref_root; + full_ref->parent = parent; full_ref->level = level; - trace_add_delayed_tree_ref(fs_info, ref, full_ref, action); + trace_add_delayed_tree_ref(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);
--
2.7.4