From fae2d5ca5444bd66af2fefff25c8f01ad50ed2a1 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 27 May 2018 22:23:16 -0400 Subject: bcachefs: fix another minor locking bug --- fs/bcachefs/btree_iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 70c3132eb538..4f8b0c963d4a 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -152,7 +152,7 @@ bool __bch2_btree_node_lock(struct btree *b, struct bpos pos, * the prev sibling in btree node merging: */ if (iter->nodes_locked && - __ffs(iter->nodes_locked) == level && + __ffs(iter->nodes_locked) <= level && __btree_iter_cmp(iter->btree_id, pos, iter)) return false; -- cgit v1.2.3