Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQu Wenruo <wqu@suse.com>2019-05-17 17:24:48 +0800
committerQu Wenruo <wqu@suse.com>2019-05-17 17:24:48 +0800
commit03fcdd40ecc5363fe988d634413263a2f7d28513 (patch)
treec592a28dfd371c849bc1c79e4fae0bc0292c8286
parentb61d10d3b82109758d510d2102742cd04d64af39 (diff)
btrfs: Use init_delayed_ref_common in add_delayed_data_ref
(bsc#1134813). suse-commit: 3f060b8a02b73ee0dc618bdf5c78d55f87eccc40
-rw-r--r--fs/btrfs/delayed-ref.c34
1 files changed, 10 insertions, 24 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 66cc1f4453fa..f3f4f13e98be 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -776,41 +776,27 @@ add_delayed_data_ref(struct btrfs_fs_info *fs_info,
{
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(&fs_info->tree_mod_seq);
-
- /* 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_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(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)