Skip to content

Commit

Permalink
btrfs: Drop fs_info parameter from add_delayed_data_ref
Browse files Browse the repository at this point in the history
It's provided by the transaction handle.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
lorddoskias authored and kdave committed May 28, 2018
1 parent 1acda0c commit f033798
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions fs/btrfs/delayed-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,7 @@ add_delayed_tree_ref(struct btrfs_fs_info *fs_info,
* helper to insert a delayed data ref into the rbtree.
*/
static noinline void
add_delayed_data_ref(struct btrfs_fs_info *fs_info,
struct btrfs_trans_handle *trans,
add_delayed_data_ref(struct btrfs_trans_handle *trans,
struct btrfs_delayed_ref_head *head_ref,
struct btrfs_delayed_ref_node *ref, u64 bytenr,
u64 num_bytes, u64 parent, u64 ref_root, u64 owner,
Expand All @@ -722,7 +721,7 @@ add_delayed_data_ref(struct btrfs_fs_info *fs_info,
delayed_refs = &trans->transaction->delayed_refs;

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

/* first set the basic ref node struct up */
refcount_set(&ref->refs, 1);
Expand All @@ -747,7 +746,7 @@ add_delayed_data_ref(struct btrfs_fs_info *fs_info,
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);

ret = insert_delayed_ref(trans, delayed_refs, head_ref, ref);
if (ret > 0)
Expand Down Expand Up @@ -871,9 +870,8 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,
action, 1, 0, &qrecord_inserted,
old_ref_mod, new_ref_mod);

add_delayed_data_ref(fs_info, trans, head_ref, &ref->node, bytenr,
num_bytes, parent, ref_root, owner, offset,
action);
add_delayed_data_ref(trans, head_ref, &ref->node, bytenr, num_bytes,
parent, ref_root, owner, offset, action);
spin_unlock(&delayed_refs->lock);

if (qrecord_inserted)
Expand Down

0 comments on commit f033798

Please sign in to comment.