On Tue, Apr 15, 2025 at 01:33:04PM +0800, Alan Huang wrote:
> Signed-off-by: Alan Huang <mmpgour...@gmail.com>
Applied
> ---
> fs/bcachefs/btree_cache.c | 2 +-
> fs/bcachefs/btree_locking.c | 7 -------
> fs/bcachefs/btree_locking.h | 1 -
> 3 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c
> index 9b80201c7982..153980a9a1cc 100644
> --- a/fs/bcachefs/btree_cache.c
> +++ b/fs/bcachefs/btree_cache.c
> @@ -978,7 +978,7 @@ static noinline struct btree *bch2_btree_node_fill(struct
> btree_trans *trans,
>
> /* Unlock before doing IO: */
> six_unlock_intent(&b->c.lock);
> - bch2_trans_unlock_noassert(trans);
> + bch2_trans_unlock(trans);
>
> bch2_btree_node_read(trans, b, sync);
>
> diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
> index 94eb2b73a843..f4f563944340 100644
> --- a/fs/bcachefs/btree_locking.c
> +++ b/fs/bcachefs/btree_locking.c
> @@ -799,13 +799,6 @@ int bch2_trans_relock_notrace(struct btree_trans *trans)
> return __bch2_trans_relock(trans, false);
> }
>
> -void bch2_trans_unlock_noassert(struct btree_trans *trans)
> -{
> - __bch2_trans_unlock(trans);
> -
> - trans_set_unlocked(trans);
> -}
> -
> void bch2_trans_unlock(struct btree_trans *trans)
> {
> __bch2_trans_unlock(trans);
> diff --git a/fs/bcachefs/btree_locking.h b/fs/bcachefs/btree_locking.h
> index b33ab7af8440..66b27c0853a5 100644
> --- a/fs/bcachefs/btree_locking.h
> +++ b/fs/bcachefs/btree_locking.h
> @@ -15,7 +15,6 @@
>
> void bch2_btree_lock_init(struct btree_bkey_cached_common *, enum
> six_lock_init_flags, gfp_t gfp);
>
> -void bch2_trans_unlock_noassert(struct btree_trans *);
> void bch2_trans_unlock_write(struct btree_trans *);
>
> static inline bool is_btree_node(struct btree_path *path, unsigned l)
> --
> 2.48.1
>
