bcachefs: Change where merging of interior btree nodes is trigger from

Browse source

Previously, we were doing btree node merging from
bch2_btree_insert_node() - but this is called from the split path, when
we're in the middle of creating new nodes and deleting new nodes and the
iterators are in a weird state.

Also, this means we're starting a new btree_update while in the middle
of an existing one, and that's asking for deadlocks.

Much simpler and saner to trigger btree node merging _after_ the whole
btree node split path is finished.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

...

This commit is contained in:

Kent Overstreet 2021-03-31 15:39:16 -04:00 • committed by Kent Overstreet

parent e264b2f62a

commit 1259cc31b2

1 changed files with 7 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

16

fs/bcachefs/btree_update_interior.c

View file