bcachefs: Fix a deadlock

Browse source

__bch2_btree_node_lock() was incorrectly using iter->pos as a proxy for
btree node lock ordering, this caused an off by one error that was
triggered by bch2_btree_node_get_sibling() getting the previous node.

This refactors the code to compare against btree node keys directly.

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

...

This commit is contained in:

Kent Overstreet 2020-06-12 14:58:07 -04:00 • committed by Kent Overstreet

parent 4e8224ed8a

commit 515282ac7d

4 changed files with 67 additions and 32 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

69

fs/bcachefs/btree_iter.c

View file

24

fs/bcachefs/btree_locking.h

View file

4

fs/bcachefs/btree_types.h

View file

2

fs/bcachefs/btree_update_leaf.c

View file