Skip to content

Commit 12f2860

Browse files
author
Kent Overstreet
committed
bcachefs: btree_iter_peek_upto() now handles BTREE_ITER_all_snapshots
end_pos now compares against snapshot ID when required Signed-off-by: Kent Overstreet <[email protected]>
1 parent 38864ec commit 12f2860

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

fs/bcachefs/btree_iter.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,9 +2381,9 @@ struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *iter, struct bpos e
23812381
else
23822382
iter_pos = bkey_max(iter->pos, bkey_start_pos(k.k));
23832383

2384-
if (unlikely(!(iter->flags & BTREE_ITER_is_extents)
2385-
? bkey_gt(iter_pos, end)
2386-
: bkey_ge(iter_pos, end)))
2384+
if (unlikely(iter->flags & BTREE_ITER_all_snapshots ? bpos_gt(iter_pos, end) :
2385+
iter->flags & BTREE_ITER_is_extents ? bkey_ge(iter_pos, end) :
2386+
bkey_gt(iter_pos, end)))
23872387
goto end;
23882388

23892389
break;

0 commit comments

Comments
 (0)