diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-06-30 16:35:37 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-14 04:59:38 -0400 |
| commit | 29f20baecf850c6381a48ceb57dcefac8e15bd5b (patch) | |
| tree | 0436e075bd8499e67ae70887e3b7b1ee6f823394 /fs/bcachefs/btree_key_cache.c | |
| parent | d91a7b6ebca99e6140c913038614f153bc4d4610 (diff) | |
bcachefs: Fixes for 4.19bcachefs-v4.19-backport-2.0
Diffstat (limited to 'fs/bcachefs/btree_key_cache.c')
| -rw-r--r-- | fs/bcachefs/btree_key_cache.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index 35e941949f49..7dc68afdb96a 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -813,7 +813,7 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, do { struct rhash_head *pos, *next; - pos = rht_ptr_rcu(rht_bucket(tbl, bc->shrink_iter)); + pos = *rht_bucket(tbl, bc->shrink_iter); while (!rht_is_a_nulls(pos)) { next = rht_dereference_bucket_rcu(pos->next, tbl, bc->shrink_iter); @@ -930,17 +930,8 @@ void bch2_fs_btree_key_cache_init_early(struct btree_key_cache *c) INIT_LIST_HEAD(&c->freed_nonpcpu); } -static void bch2_btree_key_cache_shrinker_to_text(struct printbuf *out, struct shrinker *shrink) -{ - struct btree_key_cache *bc = - container_of(shrink, struct btree_key_cache, shrink); - - bch2_btree_key_cache_to_text(out, bc); -} - int bch2_fs_btree_key_cache_init(struct btree_key_cache *bc) { - struct bch_fs *c = container_of(bc, struct bch_fs, btree_key_cache); int ret; bc->pcpu_freed = alloc_percpu(struct btree_key_cache_freelist); @@ -956,8 +947,7 @@ int bch2_fs_btree_key_cache_init(struct btree_key_cache *bc) bc->shrink.seeks = 1; bc->shrink.count_objects = bch2_btree_key_cache_count; bc->shrink.scan_objects = bch2_btree_key_cache_scan; - bc->shrink.to_text = bch2_btree_key_cache_shrinker_to_text; - return register_shrinker(&bc->shrink, "%s/btree_key_cache", c->name); + return register_shrinker(&bc->shrink); } void bch2_btree_key_cache_to_text(struct printbuf *out, struct btree_key_cache *c) |