Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQu Wenruo <wqu@suse.com>2019-05-17 17:20:45 +0800
committerQu Wenruo <wqu@suse.com>2019-05-17 17:20:45 +0800
commitb61d10d3b82109758d510d2102742cd04d64af39 (patch)
tree11b20fdd9307203d6c507ab221101f08743e14b8
parentf773f1ffb560850b0ff1d69b23cd8fbe7245392c (diff)
btrfs: Use init_delayed_ref_common in add_delayed_tree_ref
(bsc#1134813). suse-commit: 380bf2e256a99163fb827328d729802e56070641
-rw-r--r--fs/btrfs/delayed-ref.c33
1 files changed, 10 insertions, 23 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 698dd418e3cc..66cc1f4453fa 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -733,38 +733,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 */
- atomic_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);