From 52bf51b91f5d19ab0555b901023def61d60f1a97 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Tue, 20 Dec 2022 10:51:20 -0500 Subject: [PATCH] bcachefs: Fix __btree_trans_peek_key_cache() We were returning a pointer to a variable on the stack - oops. Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_iter.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 8a18b55cab261..c95dbeaaceab4 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -1851,6 +1851,7 @@ struct bkey_s_c __btree_trans_peek_key_cache(struct btree_iter *iter, struct bpo struct btree_trans *trans = iter->trans; struct bch_fs *c = trans->c; struct bkey u; + struct bkey_s_c k; int ret; if (!bch2_btree_key_cache_find(c, iter->btree_id, pos)) @@ -1870,7 +1871,12 @@ struct bkey_s_c __btree_trans_peek_key_cache(struct btree_iter *iter, struct bpo btree_path_set_should_be_locked(iter->key_cache_path); - return bch2_btree_path_peek_slot(iter->key_cache_path, &u); + k = bch2_btree_path_peek_slot(iter->key_cache_path, &u); + if (k.k && !bkey_err(k)) { + iter->k = u; + k.k = &iter->k; + } + return k; } static noinline -- 2.30.2