| Message ID | 730412da5b804df3b373aee79429c8ecaebf2535.1670835448.git.johannes.thumshirn@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: delayed_ref parameter cleanup | expand |
On 2022/12/12 17:02, Johannes Thumshirn wrote: > 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. > > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/delayed-ref.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c > index 663e7493926f..046ba49b8f94 100644 > --- a/fs/btrfs/delayed-ref.c > +++ b/fs/btrfs/delayed-ref.c > @@ -451,8 +451,7 @@ static inline void drop_delayed_ref(struct btrfs_delayed_ref_root *delayed_refs, > atomic_dec(&delayed_refs->num_entries); > } > > -static bool merge_ref(struct btrfs_trans_handle *trans, > - struct btrfs_delayed_ref_root *delayed_refs, > +static bool merge_ref(struct btrfs_delayed_ref_root *delayed_refs, > struct btrfs_delayed_ref_head *head, > struct btrfs_delayed_ref_node *ref, > u64 seq) > @@ -523,7 +522,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, > ref = rb_entry(node, struct btrfs_delayed_ref_node, ref_node); > if (seq && ref->seq >= seq) > continue; > - if (merge_ref(trans, delayed_refs, head, ref, seq)) > + if (merge_ref(delayed_refs, head, ref, seq)) > goto again; > } > }
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 663e7493926f..046ba49b8f94 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -451,8 +451,7 @@ static inline void drop_delayed_ref(struct btrfs_delayed_ref_root *delayed_refs, atomic_dec(&delayed_refs->num_entries); } -static bool merge_ref(struct btrfs_trans_handle *trans, - struct btrfs_delayed_ref_root *delayed_refs, +static bool merge_ref(struct btrfs_delayed_ref_root *delayed_refs, struct btrfs_delayed_ref_head *head, struct btrfs_delayed_ref_node *ref, u64 seq) @@ -523,7 +522,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, ref = rb_entry(node, struct btrfs_delayed_ref_node, ref_node); if (seq && ref->seq >= seq) continue; - if (merge_ref(trans, delayed_refs, head, ref, seq)) + if (merge_ref(delayed_refs, head, ref, seq)) goto again; } }
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. Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- fs/btrfs/delayed-ref.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)