| Message ID | 49459983637681dd5d1b4c04d0f9dc2e6ada301c.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 none of the functions called by btrfs_merge_delayed_refs() needs > a btrfs_trans_handle, directly pass in a btrfs_fs_info to > btrfs_merge_delayed_refs(). > > Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/delayed-ref.c | 3 +-- > fs/btrfs/delayed-ref.h | 2 +- > fs/btrfs/extent-tree.c | 4 ++-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c > index 678ce95c04ac..886ffb232eac 100644 > --- a/fs/btrfs/delayed-ref.c > +++ b/fs/btrfs/delayed-ref.c > @@ -497,11 +497,10 @@ static bool merge_ref(struct btrfs_delayed_ref_root *delayed_refs, > return done; > } > > -void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, > +void btrfs_merge_delayed_refs(struct btrfs_fs_info *fs_info, > struct btrfs_delayed_ref_root *delayed_refs, > struct btrfs_delayed_ref_head *head) > { > - struct btrfs_fs_info *fs_info = trans->fs_info; > struct btrfs_delayed_ref_node *ref; > struct rb_node *node; > u64 seq = 0; > diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h > index d6304b690ec4..2eb34abf700f 100644 > --- a/fs/btrfs/delayed-ref.h > +++ b/fs/btrfs/delayed-ref.h > @@ -357,7 +357,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans, > int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans, > u64 bytenr, u64 num_bytes, > struct btrfs_delayed_extent_op *extent_op); > -void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, > +void btrfs_merge_delayed_refs(struct btrfs_fs_info *fs_info, > struct btrfs_delayed_ref_root *delayed_refs, > struct btrfs_delayed_ref_head *head); > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index 892d78c1853c..eaa1fb2850d7 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -1963,7 +1963,7 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans, > cond_resched(); > > spin_lock(&locked_ref->lock); > - btrfs_merge_delayed_refs(trans, delayed_refs, locked_ref); > + btrfs_merge_delayed_refs(fs_info, delayed_refs, locked_ref); > } > > return 0; > @@ -2010,7 +2010,7 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, > * insert_inline_extent_backref()). > */ > spin_lock(&locked_ref->lock); > - btrfs_merge_delayed_refs(trans, delayed_refs, locked_ref); > + btrfs_merge_delayed_refs(fs_info, delayed_refs, locked_ref); > > ret = btrfs_run_delayed_refs_for_head(trans, locked_ref, > &actual_count);
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 678ce95c04ac..886ffb232eac 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -497,11 +497,10 @@ static bool merge_ref(struct btrfs_delayed_ref_root *delayed_refs, return done; } -void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, +void btrfs_merge_delayed_refs(struct btrfs_fs_info *fs_info, struct btrfs_delayed_ref_root *delayed_refs, struct btrfs_delayed_ref_head *head) { - struct btrfs_fs_info *fs_info = trans->fs_info; struct btrfs_delayed_ref_node *ref; struct rb_node *node; u64 seq = 0; diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index d6304b690ec4..2eb34abf700f 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h @@ -357,7 +357,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans, int btrfs_add_delayed_extent_op(struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes, struct btrfs_delayed_extent_op *extent_op); -void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans, +void btrfs_merge_delayed_refs(struct btrfs_fs_info *fs_info, struct btrfs_delayed_ref_root *delayed_refs, struct btrfs_delayed_ref_head *head); diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 892d78c1853c..eaa1fb2850d7 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1963,7 +1963,7 @@ static int btrfs_run_delayed_refs_for_head(struct btrfs_trans_handle *trans, cond_resched(); spin_lock(&locked_ref->lock); - btrfs_merge_delayed_refs(trans, delayed_refs, locked_ref); + btrfs_merge_delayed_refs(fs_info, delayed_refs, locked_ref); } return 0; @@ -2010,7 +2010,7 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, * insert_inline_extent_backref()). */ spin_lock(&locked_ref->lock); - btrfs_merge_delayed_refs(trans, delayed_refs, locked_ref); + btrfs_merge_delayed_refs(fs_info, delayed_refs, locked_ref); ret = btrfs_run_delayed_refs_for_head(trans, locked_ref, &actual_count);
Now that none of the functions called by btrfs_merge_delayed_refs() needs a btrfs_trans_handle, directly pass in a btrfs_fs_info to btrfs_merge_delayed_refs(). Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- fs/btrfs/delayed-ref.c | 3 +-- fs/btrfs/delayed-ref.h | 2 +- fs/btrfs/extent-tree.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-)