Merge tag 'ubifs-for-linus-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 366941d..09e270d 100644 (file)
--- 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.
@@ -923,8 +919,10 @@ static void free_buds(struct ubifs_info *c)
 {
        struct ubifs_bud *bud, *n;
 
-       rbtree_postorder_for_each_entry_safe(bud, n, &c->buds, rb)
+       rbtree_postorder_for_each_entry_safe(bud, n, &c->buds, rb) {
+               kfree(bud->log_hash);
                kfree(bud);
+       }
 }
 
 /**
@@ -1193,6 +1191,7 @@ static void destroy_journal(struct ubifs_info *c)
 
                bud = list_entry(c->old_buds.next, struct ubifs_bud, list);
                list_del(&bud->list);
+               kfree(bud->log_hash);
                kfree(bud);
        }
        ubifs_destroy_idx_gc(c);
@@ -2373,7 +2372,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 +2438,15 @@ 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;
+
+       shrinker_register(ubifs_shrinker_info);
+
        err = ubifs_compressors_init();
        if (err)
                goto out_shrinker;
@@ -2467,7 +2471,7 @@ out_dbg:
        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 +2487,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