diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-09-05 06:22:32 +0200 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 23:09:11 +0200 |
| commit | 22b383ad7e1928de8da14d66a7154a9bfebf9a46 (patch) | |
| tree | b2ba8316831f978f5f9b621003ee25cd81f24ebe /fs/bcachefs/btree_update_interior.h | |
| parent | bcachefs: Drop some fast path tracepoints (diff) | |
| download | linux-22b383ad7e1928de8da14d66a7154a9bfebf9a46.tar.xz linux-22b383ad7e1928de8da14d66a7154a9bfebf9a46.zip | |
bcachefs: Kill retry loop in btree merge path
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/btree_update_interior.h')
| -rw-r--r-- | fs/bcachefs/btree_update_interior.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/bcachefs/btree_update_interior.h b/fs/bcachefs/btree_update_interior.h index c06cfcc66db7..8e03bd987d6d 100644 --- a/fs/bcachefs/btree_update_interior.h +++ b/fs/bcachefs/btree_update_interior.h @@ -129,11 +129,7 @@ static inline int bch2_foreground_maybe_merge_sibling(struct btree_trans *trans, { struct btree *b; - if (path->uptodate >= BTREE_ITER_NEED_TRAVERSE) - return 0; - - if (!bch2_btree_node_relock(trans, path, level)) - return 0; + EBUG_ON(!btree_node_locked(path, level)); b = path->l[level].b; if (b->sib_u64s[sib] > trans->c->btree_foreground_merge_threshold) |