Merge tag 'trace-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[firefly-linux-kernel-4.4.55.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 20f5dbd7c6a8b6bee476dc6139b803c1e14d5a47..9547a27868ad49e11151c324c8f60a7db2bc92f6 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2246,7 +2246,9 @@ static int __init ubifs_init(void)
        if (!ubifs_inode_slab)
                return -ENOMEM;
 
-       register_shrinker(&ubifs_shrinker_info);
+       err = register_shrinker(&ubifs_shrinker_info);
+       if (err)
+               goto out_slab;
 
        err = ubifs_compressors_init();
        if (err)
@@ -2270,6 +2272,7 @@ out_compr:
        ubifs_compressors_exit();
 out_shrinker:
        unregister_shrinker(&ubifs_shrinker_info);
+out_slab:
        kmem_cache_destroy(ubifs_inode_slab);
        return err;
 }