From b7b31a327f7106c94a5d9e56f961041da466abc8 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 27 May 2018 22:23:26 -0400 Subject: bcachefs: btree allocation deadlock fix --- fs/bcachefs/btree_update_interior.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 817c3dee553e..93909334166e 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1564,11 +1564,15 @@ int bch2_btree_split_leaf(struct bch_fs *c, struct btree_iter *iter, struct btree_update *as; struct closure cl; int ret = 0; + struct btree_iter *linked; /* * We already have a disk reservation and open buckets pinned; this * allocation must not block: */ + for_each_linked_btree_iter(iter, linked) + if (linked->btree_id == BTREE_ID_EXTENTS) + btree_reserve_flags |= BTREE_INSERT_USE_RESERVE; if (iter->btree_id == BTREE_ID_EXTENTS) btree_reserve_flags |= BTREE_INSERT_USE_RESERVE; -- cgit v1.2.3