Skip to content

Commit bd5b097

Browse files
author
Kent Overstreet
committed
bcachefs: Don't set btree_path to updtodate if we don't fill
This fixes various locking asserts, and a null ptr deref in bch2_btree_iter_peek_path(). Signed-off-by: Kent Overstreet <[email protected]>
1 parent cf67f46 commit bd5b097

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

fs/bcachefs/btree_key_cache.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,8 @@ static noinline int btree_key_cache_fill(struct btree_trans *trans,
291291
struct btree_path *ck_path,
292292
unsigned flags)
293293
{
294-
if (flags & BTREE_ITER_cached_nofill) {
295-
ck_path->uptodate = BTREE_ITER_UPTODATE;
294+
if (flags & BTREE_ITER_cached_nofill)
296295
return 0;
297-
}
298296

299297
struct bch_fs *c = trans->c;
300298
struct btree_iter iter;

0 commit comments

Comments
 (0)