fix shrinker_free()

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h
index 2d1adabf7f2b4e04271c5fb74e3ed4dda90a1dcd..d0a84794e96c80bbb9dcca643de3da02eea1aeb5 100644 (file)
--- a/include/linux/shrinker.h
+++ b/include/linux/shrinker.h
@@ -25,15 +25,10 @@ struct shrinker {
        void    *private_data;
 };
 
-static inline void shrinker_free(struct shrinker *s)
-{
-       free(s);
-}
-
+void shrinker_free(struct shrinker *);
 struct shrinker *shrinker_alloc(unsigned int, const char *, ...);
 
 int shrinker_register(struct shrinker *);
-void shrinker_unregister(struct shrinker *);
 
 void run_shrinkers(gfp_t gfp_mask, bool);
 

diff --git a/linux/shrinker.c b/linux/shrinker.c
index 8806976943794ba8af8056a7c7fea02106fb043a..ca34ebc7e02f09ef46f0c168b57cc5ade4ac142b 100644 (file)
--- a/linux/shrinker.c
+++ b/linux/shrinker.c
@@ -13,6 +13,16 @@
 static LIST_HEAD(shrinker_list);
 static DEFINE_MUTEX(shrinker_lock);
 
+void shrinker_free(struct shrinker *s)
+{
+       if (s->list.next) {
+               mutex_lock(&shrinker_lock);
+               list_del(&s->list);
+               mutex_unlock(&shrinker_lock);
+       }
+       free(s);
+}
+
 struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...)
 {
        return calloc(sizeof(struct shrinker), 1);
@@ -26,13 +36,6 @@ int shrinker_register(struct shrinker *shrinker)
        return 0;
 }
 
-void unregister_shrinker(struct shrinker *shrinker)
-{
-       mutex_lock(&shrinker_lock);
-       list_del(&shrinker->list);
-       mutex_unlock(&shrinker_lock);
-}
-
 static void run_shrinkers_allocation_failed(gfp_t gfp_mask)
 {
        struct shrinker *shrinker;