diff options
| author | Alan Huang <mmpgouride@gmail.com> | 2025-04-15 13:33:04 +0800 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-05-21 20:14:14 -0400 |
| commit | f013b4ca356d37b2cc2e84a096c02dad592b1574 (patch) | |
| tree | 3324f81629552695951504505c2eb618c5562e97 | |
| parent | 6f03e30e7c6b759c7e9a67ca1c41f896db7b421a (diff) | |
| download | linux-f013b4ca356d37b2cc2e84a096c02dad592b1574.tar.gz linux-f013b4ca356d37b2cc2e84a096c02dad592b1574.zip | |
bcachefs: Kill bch2_trans_unlock_noassert
Signed-off-by: Alan Huang <mmpgouride@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_cache.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/btree_locking.c | 7 | ||||
| -rw-r--r-- | fs/bcachefs/btree_locking.h | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c index 66f18b7cdd40..e48089252bb9 100644 --- a/fs/bcachefs/btree_cache.c +++ b/fs/bcachefs/btree_cache.c @@ -977,7 +977,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) |