Commit baa65029 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet
Browse files

bcachefs: Change bch2_btree_key_cache_count() to exclude dirty keys 



We're seeing livelocks that appear to be due to
bch2_btree_key_cache_scan repeatedly scanning and blocking other tasks
from using the key cache lock - we probably shouldn't be reporting
objects that can't actually be freed yet.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent d99af4f1

fs/bcachefs/btree_key_cache.c

+3 −1
Original line number Diff line number Diff line
@@ -646,8 +646,10 @@ static unsigned long bch2_btree_key_cache_count(struct shrinker *shrink, 
	struct bch_fs *c = container_of(shrink, struct bch_fs,

					btree_key_cache.shrink);

	struct btree_key_cache *bc = &c->btree_key_cache;

	long nr = atomic_long_read(&bc->nr_keys) -

		atomic_long_read(&bc->nr_dirty);



	return atomic_long_read(&bc->nr_keys);

	return max(0L, nr);

}



void bch2_fs_btree_key_cache_exit(struct btree_key_cache *bc)