diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-10-27 19:32:40 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-12-21 01:36:16 -0500 |
| commit | b318882022a8ab67e9b1682bed52366072592fa7 (patch) | |
| tree | 97df6f1f599f03fbd90a5193ead29687525f9bf6 /fs/bcachefs/btree_update_interior.c | |
| parent | a71a1fac904d89fe6a5a1d407a85de0b078f1dee (diff) | |
bcachefs: bch2_trans_verify_not_unlocked_or_in_restart()
Fold two asserts into one.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_update_interior.c')
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 865c4724d550..c11babe31f54 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1960,8 +1960,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans, u64 start_time = local_clock(); int ret = 0; - bch2_trans_verify_not_in_restart(trans); - bch2_trans_verify_not_unlocked(trans); + bch2_trans_verify_not_unlocked_or_in_restart(trans); BUG_ON(!trans->paths[path].should_be_locked); BUG_ON(!btree_node_locked(&trans->paths[path], level)); |