diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-13 19:38:50 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-13 19:38:50 -0400 |
| commit | 31b61f82b420e63abe3de2fbdc30f86cc82d80bf (patch) | |
| tree | 94311d1fed0c93a0e739221555907ded8a208d76 | |
| parent | 5ac3165cfa1900194faca48959377100a7131d50 (diff) | |
fixup! bcachefs: Fix a deadlock
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 5e73791b21e0..acbd7a31ba0e 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -201,7 +201,6 @@ bool __bch2_btree_node_lock(struct btree *b, struct bpos pos, struct btree_trans *trans = iter->trans; struct btree_iter *linked; u64 start_time = local_clock(); - unsigned l; bool ret = true; /* Check if it's safe to block: */ @@ -259,7 +258,7 @@ bool __bch2_btree_node_lock(struct btree *b, struct bpos pos, if (iter->btree_id == linked->btree_id && btree_node_locked(linked, level) && - bkey_cmp(pos, linked->l[l].b->key.k.p) <= 0) + bkey_cmp(pos, linked->l[level].b->key.k.p) <= 0) ret = false; /* |