summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-05-27 22:23:16 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-06-01 17:28:35 -0400
commitfae2d5ca5444bd66af2fefff25c8f01ad50ed2a1 (patch)
treeacf833bbfdaca3b73ad3d72d366a02c6b6d874f0
parent15333ae6b82362a4d3f95151ceeea965f0e65479 (diff)
bcachefs: fix another minor locking bug
-rw-r--r--fs/bcachefs/btree_iter.c2
1 files changed, 1 insertions, 1 deletions
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;