Commit a24e6e71 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: delete faulty fastpath in bch2_btree_path_traverse_cached() 



bch2_btree_path_traverse_cached() was previously checking if it could
just relock the path, which is a common idiom in path traversal.

However, it was using btree_node_relock(), not btree_path_relock();
btree_path_relock() only succeeds if the path was in state
BTREE_ITER_NEED_RELOCK.

If the path was in state BTREE_ITER_NEED_TRAVERSE a full traversal is
needed; this led to a null ptr deref in
bch2_btree_path_traverse_cached().

And the short circuit check here isn't needed, since it was already done
in the main bch2_btree_path_traverse_one().

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 8a2491db

fs/bcachefs/btree_key_cache.c

+0 −5
Original line number Diff line number Diff line
@@ -497,11 +497,6 @@ int bch2_btree_path_traverse_cached(struct btree_trans *trans, struct btree_path 


	path->l[1].b = NULL;



	if (bch2_btree_node_relock_notrace(trans, path, 0)) {

		path->uptodate = BTREE_ITER_UPTODATE;

		return 0;

	}



	int ret;

	do {

		ret = btree_path_traverse_cached_fast(trans, path);