[PATCH v4 17/48] ubifs: dynamically allocate the ubifs-slab shrinker

[Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>]

Use new APIs to dynamically allocate the ubifs-slab shrinker.

Signed-off-by: Qi Zheng <zhengqi.arch@xxxxxxxxxxxxx>
Reviewed-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
---
 fs/ubifs/super.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index b08fb28d16b5..c690782388a8 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -54,11 +54,7 @@ module_param_cb(default_version, &ubifs_default_version_ops, 
&ubifs_default_vers
 static struct kmem_cache *ubifs_inode_slab;
 
 /* UBIFS TNC shrinker description */
-static struct shrinker ubifs_shrinker_info = {
-       .scan_objects = ubifs_shrink_scan,
-       .count_objects = ubifs_shrink_count,
-       .seeks = DEFAULT_SEEKS,
-};
+static struct shrinker *ubifs_shrinker_info;
 
 /**
  * validate_inode - validate inode.
@@ -2373,7 +2369,7 @@ static void inode_slab_ctor(void *obj)
 
 static int __init ubifs_init(void)
 {
-       int err;
+       int err = -ENOMEM;
 
        BUILD_BUG_ON(sizeof(struct ubifs_ch) != 24);
 
@@ -2439,10 +2435,16 @@ static int __init ubifs_init(void)
        if (!ubifs_inode_slab)
                return -ENOMEM;
 
-       err = register_shrinker(&ubifs_shrinker_info, "ubifs-slab");
-       if (err)
+       ubifs_shrinker_info = shrinker_alloc(0, "ubifs-slab");
+       if (!ubifs_shrinker_info)
                goto out_slab;
 
+       ubifs_shrinker_info->count_objects = ubifs_shrink_count;
+       ubifs_shrinker_info->scan_objects = ubifs_shrink_scan;
+       ubifs_shrinker_info->seeks = DEFAULT_SEEKS;
+
+       shrinker_register(ubifs_shrinker_info);
+
        err = ubifs_compressors_init();
        if (err)
                goto out_shrinker;
@@ -2467,7 +2469,7 @@ static int __init ubifs_init(void)
        dbg_debugfs_exit();
        ubifs_compressors_exit();
 out_shrinker:
-       unregister_shrinker(&ubifs_shrinker_info);
+       shrinker_free(ubifs_shrinker_info);
 out_slab:
        kmem_cache_destroy(ubifs_inode_slab);
        return err;
@@ -2483,7 +2485,7 @@ static void __exit ubifs_exit(void)
        dbg_debugfs_exit();
        ubifs_sysfs_exit();
        ubifs_compressors_exit();
-       unregister_shrinker(&ubifs_shrinker_info);
+       shrinker_free(ubifs_shrinker_info);
 
        /*
         * Make sure all delayed rcu free inodes are flushed before we
-- 
2.30.2