erofs: move each decompressor to its own source file

Thus *_config() function declarations can be avoided.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240709094106.3018109-1-hsiangkao@linux.alibaba.com

diff --git a/fs/erofs/compress.h b/fs/erofs/compress.h
index 19d53c30c8afacb17bc8b1bb123e582eb531b467..c68d5739932fc71424db51d21b9a210ec6adbff5 100644 (file)
--- a/fs/erofs/compress.h
+++ b/fs/erofs/compress.h
@@ -81,21 +81,11 @@ static inline bool z_erofs_put_shortlivedpage(struct page **pagepool,
        return true;
 }
 
+extern const struct z_erofs_decompressor z_erofs_lzma_decomp;
+extern const struct z_erofs_decompressor z_erofs_deflate_decomp;
+extern const struct z_erofs_decompressor z_erofs_zstd_decomp;
+extern const struct z_erofs_decompressor *z_erofs_decomp[];
+
 int z_erofs_fixup_insize(struct z_erofs_decompress_req *rq, const char *padbuf,
                         unsigned int padbufsize);
-extern const struct z_erofs_decompressor erofs_decompressors[];
-
-/* prototypes for specific algorithms */
-int z_erofs_load_lzma_config(struct super_block *sb,
-                       struct erofs_super_block *dsb, void *data, int size);
-int z_erofs_load_deflate_config(struct super_block *sb,
-                       struct erofs_super_block *dsb, void *data, int size);
-int z_erofs_load_zstd_config(struct super_block *sb,
-                       struct erofs_super_block *dsb, void *data, int size);
-int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,
-                           struct page **pagepool);
-int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,
-                              struct page **pagepool);
-int z_erofs_zstd_decompress(struct z_erofs_decompress_req *rq,
-                           struct page **pgpl);
 #endif

diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c
index 9d85b6c11c6b0c5d8a857ad164328947bf5faa9d..de50a9de4e8ad57ee8320497e675499501d8e48d 100644 (file)
--- a/fs/erofs/decompressor.c
+++ b/fs/erofs/decompressor.c
@@ -371,40 +371,28 @@ static int z_erofs_transform_plain(struct z_erofs_decompress_req *rq,
        return 0;
 }
 
-const struct z_erofs_decompressor erofs_decompressors[] = {
-       [Z_EROFS_COMPRESSION_SHIFTED] = {
+const struct z_erofs_decompressor *z_erofs_decomp[] = {
+       [Z_EROFS_COMPRESSION_SHIFTED] = &(const struct z_erofs_decompressor) {
                .decompress = z_erofs_transform_plain,
                .name = "shifted"
        },
-       [Z_EROFS_COMPRESSION_INTERLACED] = {
+       [Z_EROFS_COMPRESSION_INTERLACED] = &(const struct z_erofs_decompressor) {
                .decompress = z_erofs_transform_plain,
                .name = "interlaced"
        },
-       [Z_EROFS_COMPRESSION_LZ4] = {
+       [Z_EROFS_COMPRESSION_LZ4] = &(const struct z_erofs_decompressor) {
                .config = z_erofs_load_lz4_config,
                .decompress = z_erofs_lz4_decompress,
                .name = "lz4"
        },
 #ifdef CONFIG_EROFS_FS_ZIP_LZMA
-       [Z_EROFS_COMPRESSION_LZMA] = {
-               .config = z_erofs_load_lzma_config,
-               .decompress = z_erofs_lzma_decompress,
-               .name = "lzma"
-       },
+       [Z_EROFS_COMPRESSION_LZMA] = &z_erofs_lzma_decomp,
 #endif
 #ifdef CONFIG_EROFS_FS_ZIP_DEFLATE
-       [Z_EROFS_COMPRESSION_DEFLATE] = {
-               .config = z_erofs_load_deflate_config,
-               .decompress = z_erofs_deflate_decompress,
-               .name = "deflate"
-       },
+       [Z_EROFS_COMPRESSION_DEFLATE] = &z_erofs_deflate_decomp,
 #endif
 #ifdef CONFIG_EROFS_FS_ZIP_ZSTD
-       [Z_EROFS_COMPRESSION_ZSTD] = {
-               .config = z_erofs_load_zstd_config,
-               .decompress = z_erofs_zstd_decompress,
-               .name = "zstd"
-       },
+       [Z_EROFS_COMPRESSION_ZSTD] = &z_erofs_zstd_decomp,
 #endif
 };
 
@@ -432,6 +420,7 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)
        offset = EROFS_SUPER_OFFSET + sbi->sb_size;
        alg = 0;
        for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {
+               const struct z_erofs_decompressor *dec = z_erofs_decomp[alg];
                void *data;
 
                if (!(algs & 1))
@@ -443,16 +432,13 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb)
                        break;
                }
 
-               if (alg >= ARRAY_SIZE(erofs_decompressors) ||
-                   !erofs_decompressors[alg].config) {
+               if (alg < Z_EROFS_COMPRESSION_MAX && dec && dec->config) {
+                       ret = dec->config(sb, dsb, data, size);
+               } else {
                        erofs_err(sb, "algorithm %d isn't enabled on this kernel",
                                  alg);
                        ret = -EOPNOTSUPP;
-               } else {
-                       ret = erofs_decompressors[alg].config(sb,
-                                       dsb, data, size);
                }
-
                kfree(data);
                if (ret)
                        break;

diff --git a/fs/erofs/decompressor_deflate.c b/fs/erofs/decompressor_deflate.c
index 3a3461561a3c9b38947af09081d31f555c92b00e..1c0ed77dcdb2a62abc3f2618d17adba9e90525d1 100644 (file)
--- a/fs/erofs/decompressor_deflate.c
+++ b/fs/erofs/decompressor_deflate.c
@@ -49,7 +49,7 @@ int __init z_erofs_deflate_init(void)
        return 0;
 }
 
-int z_erofs_load_deflate_config(struct super_block *sb,
+static int z_erofs_load_deflate_config(struct super_block *sb,
                        struct erofs_super_block *dsb, void *data, int size)
 {
        struct z_erofs_deflate_cfgs *dfl = data;
@@ -97,8 +97,8 @@ failed:
        return -ENOMEM;
 }
 
-int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,
-                              struct page **pgpl)
+static int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq,
+                                     struct page **pgpl)
 {
        const unsigned int nrpages_out =
                PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -252,3 +252,9 @@ failed_zinit:
        wake_up(&z_erofs_deflate_wq);
        return err;
 }
+
+const struct z_erofs_decompressor z_erofs_deflate_decomp = {
+       .config = z_erofs_load_deflate_config,
+       .decompress = z_erofs_deflate_decompress,
+       .name = "deflate",
+};

diff --git a/fs/erofs/decompressor_lzma.c b/fs/erofs/decompressor_lzma.c
index 4b28dc130c9f1134bd548bada258e86931b8f7cf..9cab3a2f755804d01dffbffeb3b9df70ad14d3b2 100644 (file)
--- a/fs/erofs/decompressor_lzma.c
+++ b/fs/erofs/decompressor_lzma.c
@@ -70,7 +70,7 @@ int __init z_erofs_lzma_init(void)
        return 0;
 }
 
-int z_erofs_load_lzma_config(struct super_block *sb,
+static int z_erofs_load_lzma_config(struct super_block *sb,
                        struct erofs_super_block *dsb, void *data, int size)
 {
        static DEFINE_MUTEX(lzma_resize_mutex);
@@ -147,8 +147,8 @@ again:
        return err;
 }
 
-int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,
-                           struct page **pgpl)
+static int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq,
+                                  struct page **pgpl)
 {
        const unsigned int nrpages_out =
                PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -293,3 +293,9 @@ failed:
        wake_up(&z_erofs_lzma_wq);
        return err;
 }
+
+const struct z_erofs_decompressor z_erofs_lzma_decomp = {
+       .config = z_erofs_load_lzma_config,
+       .decompress = z_erofs_lzma_decompress,
+       .name = "lzma"
+};

diff --git a/fs/erofs/decompressor_zstd.c b/fs/erofs/decompressor_zstd.c
index 63a23cac3af4e2561a34f2229672fb178d44434a..e8f931d41e60ebb4c08325dc96004bf461a82aa5 100644 (file)
--- a/fs/erofs/decompressor_zstd.c
+++ b/fs/erofs/decompressor_zstd.c
@@ -72,7 +72,7 @@ int __init z_erofs_zstd_init(void)
        return 0;
 }
 
-int z_erofs_load_zstd_config(struct super_block *sb,
+static int z_erofs_load_zstd_config(struct super_block *sb,
                        struct erofs_super_block *dsb, void *data, int size)
 {
        static DEFINE_MUTEX(zstd_resize_mutex);
@@ -135,8 +135,8 @@ int z_erofs_load_zstd_config(struct super_block *sb,
        return strm ? -ENOMEM : 0;
 }
 
-int z_erofs_zstd_decompress(struct z_erofs_decompress_req *rq,
-                           struct page **pgpl)
+static int z_erofs_zstd_decompress(struct z_erofs_decompress_req *rq,
+                                  struct page **pgpl)
 {
        const unsigned int nrpages_out =
                PAGE_ALIGN(rq->pageofs_out + rq->outputsize) >> PAGE_SHIFT;
@@ -277,3 +277,9 @@ failed_zinit:
        wake_up(&z_erofs_zstd_wq);
        return err;
 }
+
+const struct z_erofs_decompressor z_erofs_zstd_decomp = {
+       .config = z_erofs_load_zstd_config,
+       .decompress = z_erofs_zstd_decompress,
+       .name = "zstd",
+};

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 30a9a6a3e78d3e4e8bcbc8a8fce708509f8f7644..3dbd94980de7a8d9f948266c3207d9c1f1ecc145 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1213,7 +1213,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be,
        struct z_erofs_pcluster *pcl = be->pcl;
        unsigned int pclusterpages = z_erofs_pclusterpages(pcl);
        const struct z_erofs_decompressor *decomp =
-                               &erofs_decompressors[pcl->algorithmformat];
+                               z_erofs_decomp[pcl->algorithmformat];
        int i, err2;
        struct page *page;
        bool overlapped;