diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-11-22 18:44:45 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-02-15 22:08:37 -0500 |
| commit | 70947e9dc35d54eee7da8fd2fca4521e4a103ff7 (patch) | |
| tree | d754622ba88e32dc166462f1c635bd418f015492 | |
| parent | 0a641c602131372e3c513b7f17ebbd3efbbf26ac (diff) | |
bcachefs: Assert that btree node locks aren't being leaked
This asserts (when lockdep is enabled) that btree locks aren't held when
exiting a btree_trans.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_gc.c | 3 | ||||
| -rw-r--r-- | fs/bcachefs/btree_locking.c | 7 | ||||
| -rw-r--r-- | fs/bcachefs/btree_types.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c index 9b68079e4237..d146be487a5f 100644 --- a/fs/bcachefs/btree_gc.c +++ b/fs/bcachefs/btree_gc.c @@ -1092,6 +1092,9 @@ static int bch2_gc_btrees(struct bch_fs *c, bool initial, bool metadata_only) unsigned i; int ret = 0; + if (initial) + trans->is_initial_gc = true; + for (i = 0; i < BTREE_ID_NR; i++) ids[i] = i; bubble_sort(ids, BTREE_ID_NR, btree_id_gc_phase_cmp); diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c index b6d4e601ee0e..8bcc58b55990 100644 --- a/fs/bcachefs/btree_locking.c +++ b/fs/bcachefs/btree_locking.c @@ -840,6 +840,13 @@ void bch2_trans_unlock(struct btree_trans *trans) trans->locks_held = false; } #endif + + /* + * bch2_gc_btree_init_recurse() doesn't use btree iterators for walking + * btree nodes, it implements its own walking: + */ + if (!trans->is_initial_gc) + bch2_assert_btree_nodes_not_locked(); } void bch2_trans_unlock_long(struct btree_trans *trans) diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h index 18c6c963f19d..548d15c62be6 100644 --- a/fs/bcachefs/btree_types.h +++ b/fs/bcachefs/btree_types.h @@ -412,6 +412,7 @@ struct btree_trans { bool memory_allocation_failure:1; bool journal_transaction_names:1; bool journal_replay_not_finished:1; + bool is_initial_gc:1; bool notrace_relock_fail:1; bool write_locked:1; enum bch_errcode restarted:16; |