From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 13 Jun 2025 18:53:42 +0000 (-0400)
Subject: bcachefs: Fix bch2_journal_keys_peek_prev_min()
X-Git-Tag: v6.16-rc4~24^2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e62fca2a6dbfcedaab4919d7ad2044f20fdf889;p=thirdparty%2Flinux.git

bcachefs: Fix bch2_journal_keys_peek_prev_min()

this code is rarely invoked, so - we had a few bugs left from basing it
off of bch2_journal_keys_peek_max()...

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/btree_journal_iter.c b/fs/bcachefs/btree_journal_iter.c
index cf73987516448..de996c848e43b 100644
--- a/fs/bcachefs/btree_journal_iter.c
+++ b/fs/bcachefs/btree_journal_iter.c
@@ -141,8 +141,8 @@ search:
 	if (!*idx)
 		*idx = __bch2_journal_key_search(keys, btree_id, level, pos);
 
-	while (*idx &&
-	       __journal_key_cmp(btree_id, level, end_pos, idx_to_key(keys, *idx - 1)) <= 0) {
+	while (*idx < keys->nr &&
+	       __journal_key_cmp(btree_id, level, end_pos, idx_to_key(keys, *idx - 1)) >= 0) {
 		(*idx)++;
 		iters++;
 		if (iters == 10) {