diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-12-20 18:51:20 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:47 +0300 |
| commit | 52bf51b91f5d19ab0555b901023def61d60f1a97 (patch) | |
| tree | b71f888bca661885be6075ce05bc843ef2e58b2c /fs/bcachefs/btree_iter.c | |
| parent | e88a75ebe86c1df42f0ca9ab6e8fa50db26e7cef (diff) | |
| download | linux-52bf51b91f5d19ab0555b901023def61d60f1a97.tar.xz | |
bcachefs: Fix __btree_trans_peek_key_cache()
We were returning a pointer to a variable on the stack - oops.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_iter.c')
| -rw-r--r-- | fs/bcachefs/btree_iter.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 8a18b55cab26..c95dbeaaceab 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 |