iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: remove trans parameter of merge_ref

Browse Source 
Now that drop_delayed_ref() doesn't get the btrfs_trans_handle passed in
anymore, we can get rid of it in merge_ref() as well.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Johannes Thumshirn 2022-12-12 01:02:47 -08:00 committed by David Sterba
parent 4c89493f35
commit f09f7851b7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/delayed-ref.c
View File

@ -451,8 +451,7 @@ static inline void drop_delayed_ref(struct btrfs_delayed_ref_root *delayed_refs,
atomic_dec(&delayed_refs->num_entries); atomic_dec(&delayed_refs->num_entries);
} }
static bool merge_ref(struct btrfs_trans_handle *trans, static bool merge_ref(struct btrfs_delayed_ref_root *delayed_refs,
struct btrfs_delayed_ref_root *delayed_refs,
struct btrfs_delayed_ref_head *head, struct btrfs_delayed_ref_head *head,
struct btrfs_delayed_ref_node *ref, struct btrfs_delayed_ref_node *ref,
u64 seq) u64 seq)
@ -523,7 +522,7 @@ again:
ref = rb_entry(node, struct btrfs_delayed_ref_node, ref_node); ref = rb_entry(node, struct btrfs_delayed_ref_node, ref_node);
if (seq && ref->seq >= seq) if (seq && ref->seq >= seq)
continue; continue;
if (merge_ref(trans, delayed_refs, head, ref, seq)) if (merge_ref(delayed_refs, head, ref, seq))
goto again; goto again;
} }
} }