diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-04-27 14:02:00 -0400 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-05-24 15:36:27 +0300 |
| commit | 25a48ca6ddf9b2c859fb88e99928e4ef3d33dfb3 (patch) | |
| tree | 4882978b86b367022e372779fe42e20db377ce52 | |
| parent | cbb7f8958dd101f9321c4276d2d59a8f6f2dc9fb (diff) | |
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: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_key_cache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index a0ff0c3ceb90..dfaf5e6df917 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -645,8 +645,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) |