diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-09-15 17:57:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:09 -0400 |
| commit | 34b8e552764d6f759072b8452831c6f72a28111c (patch) | |
| tree | bb3465ebea82585183432a060b0c76e7ff553d7e | |
| parent | cf0517af15e1ef43a0ece3e3dcbfc94a19e89bac (diff) | |
| download | lwn-34b8e552764d6f759072b8452831c6f72a28111c.tar.gz lwn-34b8e552764d6f759072b8452831c6f72a28111c.zip | |
bcachefs: Fix a deadlock
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 6a2fcc4201b6..6d99f3d191d3 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1550,7 +1550,13 @@ void bch2_btree_insert_node(struct btree_update *as, struct btree *b, btree_node_interior_verify(b); - bch2_foreground_maybe_merge(c, iter, b->level, flags); + /* + * when called from the btree_split path the new nodes aren't added to + * the btree iterator yet, so the merge path's unlock/wait/relock dance + * won't work: + */ + bch2_foreground_maybe_merge(c, iter, b->level, + flags|BTREE_INSERT_NOUNLOCK); return; split: btree_split(as, b, iter, keys, flags); |