Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

[bcachefs-tools-debian] / linux / shrinker.c

diff --git a/linux/shrinker.c b/linux/shrinker.c
index 8a24565ff15c94984db2e437aa37a35aa578c383..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;
@@ -71,7 +74,7 @@ void run_shrinkers(gfp_t gfp_mask, bool allocation_failed)
        si_meminfo(&info);
 
        /* Aim for 6% of physical RAM free without anything in swap */
-       want_shrink = (info.totalram << 4) - info.freeram
+       want_shrink = (info.totalram >> 4) - info.freeram
                        + info.totalswap - info.freeswap;
        if (want_shrink <= 0)
                return;