mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 19:59:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: bch2_btree_iter_peek_slot() now saves initial position when searching

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2022-12-30 19:15:53 -05:00
parent 1d214eb18d
commit b1d87f527d
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fs/bcachefs/btree_iter.c
View File

@@ -1869,10 +1869,22 @@ struct bkey_s_c bch2_btree_iter_peek_slot(struct btree_iter *iter)
}
} else {
struct bpos next;
struct bpos pos = iter->pos;
k = bch2_btree_iter_peek(iter);
iter->pos = pos;
if (iter->flags & BTREE_ITER_INTENT) {
struct btree_iter *child =
btree_iter_child_alloc(iter, _THIS_IP_);
btree_iter_copy(child, iter);
k = bch2_btree_iter_peek(child);
if (k.k && !bkey_err(k))
iter->k = child->k;
} else {
struct bpos pos = iter->pos;
k = bch2_btree_iter_peek(iter);
iter->pos = pos;
}
if (unlikely(bkey_err(k)))
return k;