From 34b8e552764d6f759072b8452831c6f72a28111c Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 15 Sep 2018 17:57:22 -0400 Subject: [PATCH] bcachefs: Fix a deadlock Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_update_interior.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 6a2fcc4201b63..6d99f3d191d30 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); -- 2.30.2