diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-20 14:41:46 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-21 13:20:14 -0400 |
| commit | a6ef096322b14b945b41388372a39e888c16d284 (patch) | |
| tree | 021888b2faedebae6fbfedcb5096d1ac59a55517 | |
| parent | b48f44d69fe425991ec49046a8490a2ce85786c7 (diff) | |
fixup! bcachefs: bch2_btree_iter_peek_all_levels()
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 6351e6c113e4..e19a9699318c 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -2210,6 +2210,9 @@ inline bool bch2_btree_iter_advance(struct btree_iter *iter) bch2_btree_iter_set_pos(iter, pos); return ret; } else { + if (!btree_path_node(iter->path, iter->path->level)) + return true; + iter->advanced = true; return false; } @@ -2600,7 +2603,7 @@ struct bkey_s_c bch2_btree_iter_peek_all_levels(struct btree_iter *iter) break; } - bch2_btree_iter_set_pos(iter, k.k->p); + iter->pos = k.k->p; out: iter->path->should_be_locked = true; bch2_btree_iter_verify(iter); |