staging: erofs: add the missing __init tags

Append __init to `erofs_init_inode_cache',
`z_erofs_init_zip_subsystem' and move these
declarations to internal.h.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
index c2cc4a0..5096b27 100644 (file)
--- a/drivers/staging/erofs/internal.h
+++ b/drivers/staging/erofs/internal.h
@@ -284,6 +284,12 @@ static inline bool __should_decompress_synchronously(struct erofs_sb_info *sbi,
        return nr <= sbi->max_sync_decompress_pages;
 }
 
+int __init z_erofs_init_zip_subsystem(void);
+void z_erofs_exit_zip_subsystem(void);
+#else
+/* dummy initializer/finalizer for the decompression subsystem */
+static inline int z_erofs_init_zip_subsystem(void) { return 0; }
+static inline void z_erofs_exit_zip_subsystem(void) {}
 #endif
 
 /* we strictly follow PAGE_SIZE and no buffer head yet */

diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index 51b0762..f69e619 100644 (file)
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -29,7 +29,7 @@ static void init_once(void *ptr)
        inode_init_once(&vi->vfs_inode);
 }
 
-static int erofs_init_inode_cache(void)
+static int __init erofs_init_inode_cache(void)
 {
        erofs_inode_cachep = kmem_cache_create("erofs_inode",
                sizeof(struct erofs_vnode), 0,
@@ -559,11 +559,6 @@ static struct file_system_type erofs_fs_type = {
 };
 MODULE_ALIAS_FS("erofs");
 
-#ifdef CONFIG_EROFS_FS_ZIP
-extern int z_erofs_init_zip_subsystem(void);
-extern void z_erofs_exit_zip_subsystem(void);
-#endif
-
 static int __init erofs_module_init(void)
 {
        int err;
@@ -579,11 +574,9 @@ static int __init erofs_module_init(void)
        if (err)
                goto shrinker_err;
 
-#ifdef CONFIG_EROFS_FS_ZIP
        err = z_erofs_init_zip_subsystem();
        if (err)
                goto zip_err;
-#endif
 
        err = register_filesystem(&erofs_fs_type);
        if (err)
@@ -593,10 +586,8 @@ static int __init erofs_module_init(void)
        return 0;
 
 fs_err:
-#ifdef CONFIG_EROFS_FS_ZIP
        z_erofs_exit_zip_subsystem();
 zip_err:
-#endif
        unregister_shrinker(&erofs_shrinker_info);
 shrinker_err:
        erofs_exit_inode_cache();
@@ -607,9 +598,7 @@ icache_err:
 static void __exit erofs_module_exit(void)
 {
        unregister_filesystem(&erofs_fs_type);
-#ifdef CONFIG_EROFS_FS_ZIP
        z_erofs_exit_zip_subsystem();
-#endif
        unregister_shrinker(&erofs_shrinker_info);
        erofs_exit_inode_cache();
        infoln("successfully finalize erofs");

diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c
index 337a82d..79d3ba6 100644 (file)
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -42,7 +42,7 @@ static inline int init_unzip_workqueue(void)
        return z_erofs_workqueue != NULL ? 0 : -ENOMEM;
 }
 
-int z_erofs_init_zip_subsystem(void)
+int __init z_erofs_init_zip_subsystem(void)
 {
        z_erofs_workgroup_cachep =
                kmem_cache_create("erofs_compress",