From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sat, 5 Oct 2024 01:40:13 +0000 (-0400)
Subject: bcachefs: btree_iter_peek_upto() now handles BTREE_ITER_all_snapshots
X-Git-Tag: v6.12-rc4~44^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12f286085bf592346cffa93d8e21b0cc2c01f9fe;p=thirdparty%2Fkernel%2Flinux.git

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 <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index bfe9f0c1e1be8..0883cf6e1a3eb 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -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;