bcachefs: Don't deadlock when btree node reuse changes lock ordering

Browse source

Btree node lock ordering is based on the logical key. However, 'struct
btree' may be reused for a different btree node under memory pressure.
This patch uses the new six lock callback to check if a btree node is no
longer the node we wanted to lock before blocking.

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 2020-06-12 22:29:48 -04:00 • committed by Kent Overstreet

parent 515282ac7d

commit bd2bb273a0

4 changed files with 62 additions and 16 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

19

fs/bcachefs/btree_cache.c

View file

38

fs/bcachefs/btree_iter.c

View file

17

fs/bcachefs/btree_locking.h

View file

2

fs/bcachefs/btree_update_interior.c

View file