diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-09-15 17:57:22 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-09-15 17:57:22 -0400 |
| commit | 2eb48097687f2619b630e76ac7755eef270e31ee (patch) | |
| tree | 7d3716616523e5b06c7f0901baff06d6f066ce6c | |
| parent | a18f3fe2a6491554deb3d3595422d3951ccbdc80 (diff) | |
bcachefs: Fix a deadlock
| -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 9828ad0fb7af..38503f8ffd9a 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1549,7 +1549,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); |