Commit 12f28608 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: btree_iter_peek_upto() now handles BTREE_ITER_all_snapshots 



end_pos now compares against snapshot ID when required

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 38864ecc

fs/bcachefs/btree_iter.c

+3 −3
Original line number Diff line number Diff line
@@ -2381,9 +2381,9 @@ struct bkey_s_c bch2_btree_iter_peek_upto(struct btree_iter *iter, struct bpos e 
		else

			iter_pos = bkey_max(iter->pos, bkey_start_pos(k.k));



		if (unlikely(!(iter->flags & BTREE_ITER_is_extents)

			     ? bkey_gt(iter_pos, end)

			     : bkey_ge(iter_pos, end)))

		if (unlikely(iter->flags & BTREE_ITER_all_snapshots	? bpos_gt(iter_pos, end) :

			     iter->flags & BTREE_ITER_is_extents	? bkey_ge(iter_pos, end) :

									  bkey_gt(iter_pos, end)))

			goto end;



		break;