bcache: dynamically allocate the md-bcache shrinker

[sfrench/cifs-2.6.git] / drivers / md / bcache / btree.c

diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
index fd121a61f17cca47ec0506aaa92dc24c11cc803f..ae5cbb55861fdb7967ad9ad686161b377de345b4 100644 (file)
--- a/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@ -667,7 +667,7 @@ out_unlock:
 static unsigned long bch_mca_scan(struct shrinker *shrink,
                                  struct shrink_control *sc)
 {
-       struct cache_set *c = container_of(shrink, struct cache_set, shrink);
+       struct cache_set *c = shrink->private_data;
        struct btree *b, *t;
        unsigned long i, nr = sc->nr_to_scan;
        unsigned long freed = 0;
@@ -734,7 +734,7 @@ out:
 static unsigned long bch_mca_count(struct shrinker *shrink,
                                   struct shrink_control *sc)
 {
-       struct cache_set *c = container_of(shrink, struct cache_set, shrink);
+       struct cache_set *c = shrink->private_data;
 
        if (c->shrinker_disabled)
                return 0;
@@ -752,8 +752,8 @@ void bch_btree_cache_free(struct cache_set *c)
 
        closure_init_stack(&cl);
 
-       if (c->shrink.list.next)
-               unregister_shrinker(&c->shrink);
+       if (c->shrink)
+               shrinker_free(c->shrink);
 
        mutex_lock(&c->bucket_lock);
 
@@ -828,14 +828,19 @@ int bch_btree_cache_alloc(struct cache_set *c)
                c->verify_data = NULL;
 #endif
 
-       c->shrink.count_objects = bch_mca_count;
-       c->shrink.scan_objects = bch_mca_scan;
-       c->shrink.seeks = 4;
-       c->shrink.batch = c->btree_pages * 2;
+       c->shrink = shrinker_alloc(0, "md-bcache:%pU", c->set_uuid);
+       if (!c->shrink) {
+               pr_warn("bcache: %s: could not allocate shrinker\n", __func__);
+               return 0;
+       }
+
+       c->shrink->count_objects = bch_mca_count;
+       c->shrink->scan_objects = bch_mca_scan;
+       c->shrink->seeks = 4;
+       c->shrink->batch = c->btree_pages * 2;
+       c->shrink->private_data = c;
 
-       if (register_shrinker(&c->shrink, "md-bcache:%pU", c->set_uuid))
-               pr_warn("bcache: %s: could not register shrinker\n",
-                               __func__);
+       shrinker_register(c->shrink);
 
        return 0;
 }