From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Fri, 13 Dec 2024 10:58:34 +0000 (-0500)
Subject: bcachefs: bch2_btree_path_peek_slot() doesn't return errors
X-Git-Tag: io_uring-6.14-20240131~27^2~58
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6679e363f44121ec07e9daeb0c78464df410bc47;p=linux-block.git

bcachefs: bch2_btree_path_peek_slot() doesn't return errors

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

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index b27944b62087..a1c5fcced24e 100644
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -2229,14 +2229,15 @@ struct bkey_s_c btree_trans_peek_key_cache(struct btree_iter *iter, struct bpos
 	btree_path_set_should_be_locked(trans, trans->paths + iter->key_cache_path);
 
 	k = bch2_btree_path_peek_slot(trans->paths + iter->key_cache_path, &u);
-	if (k.k && !bkey_err(k)) {
-		if ((iter->flags & BTREE_ITER_all_snapshots) &&
-		    !bpos_eq(pos, k.k->p))
-			return bkey_s_c_null;
+	if (!k.k)
+		return k;
 
-		iter->k = u;
-		k.k = &iter->k;
-	}
+	if ((iter->flags & BTREE_ITER_all_snapshots) &&
+	    !bpos_eq(pos, k.k->p))
+		return bkey_s_c_null;
+
+	iter->k = u;
+	k.k = &iter->k;
 	return k;
 }