From b3591acc3bc25d120dd9cb72f462e009e046a254 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 26 Jun 2023 23:31:49 -0400 Subject: [PATCH] bcachefs: unregister_shrinker() now safe on not-registered shrinker Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_cache.c | 3 +-- fs/bcachefs/btree_key_cache.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/bcachefs/btree_cache.c b/fs/bcachefs/btree_cache.c index 435e68888918..8b27b7e98f7d 100644 --- a/fs/bcachefs/btree_cache.c +++ b/fs/bcachefs/btree_cache.c @@ -398,8 +398,7 @@ void bch2_fs_btree_cache_exit(struct bch_fs *c) struct btree *b; unsigned i, flags; - if (bc->shrink.list.next) - unregister_shrinker(&bc->shrink); + unregister_shrinker(&bc->shrink); /* vfree() can allocate memory: */ flags = memalloc_nofs_save(); diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index 37beb75e2571..5f00688d46f1 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -955,8 +955,7 @@ void bch2_fs_btree_key_cache_exit(struct btree_key_cache *bc) int cpu; #endif - if (bc->shrink.list.next) - unregister_shrinker(&bc->shrink); + unregister_shrinker(&bc->shrink); mutex_lock(&bc->lock);