Commit 5a7cce82 authored by Gao Xiang's avatar Gao Xiang
Browse files

erofs: refine z_erofs_{init,exit}_subsystem() 



Introduce z_erofs_{init,exit}_decompressor() to unexport
z_erofs_{deflate,lzma,zstd}_{init,exit}().

Besides, call them in z_erofs_{init,exit}_subsystem()
for simplicity.

Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240709094106.3018109-2-hsiangkao@linux.alibaba.com
parent 392d20cc

fs/erofs/compress.h

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ struct z_erofs_decompressor { 
		      void *data, int size);

	int (*decompress)(struct z_erofs_decompress_req *rq,

			  struct page **pagepool);

	int (*init)(void);

	void (*exit)(void);

	char *name;

};
@@ -88,4 +90,6 @@ 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);

int __init z_erofs_init_decompressor(void);

void z_erofs_exit_decompressor(void);

#endif

fs/erofs/decompressor.c

+28 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/*

 * Copyright (C) 2019 HUAWEI, Inc.

 *             https://www.huawei.com/

 * Copyright (C) 2024 Alibaba Cloud

 */

#include "compress.h"

#include <linux/lz4.h>
@@ -383,6 +384,8 @@ const struct z_erofs_decompressor *z_erofs_decomp[] = { 
	[Z_EROFS_COMPRESSION_LZ4] = &(const struct z_erofs_decompressor) {

		.config = z_erofs_load_lz4_config,

		.decompress = z_erofs_lz4_decompress,

		.init = z_erofs_gbuf_init,

		.exit = z_erofs_gbuf_exit,

		.name = "lz4"

	},

#ifdef CONFIG_EROFS_FS_ZIP_LZMA
@@ -446,3 +449,28 @@ int z_erofs_parse_cfgs(struct super_block *sb, struct erofs_super_block *dsb) 
	erofs_put_metabuf(&buf);

	return ret;

}



int __init z_erofs_init_decompressor(void)

{

	int i, err;



	for (i = 0; i < Z_EROFS_COMPRESSION_MAX; ++i) {

		err = z_erofs_decomp[i] ? z_erofs_decomp[i]->init() : 0;

		if (err) {

			while (--i)

				if (z_erofs_decomp[i])

					z_erofs_decomp[i]->exit();

			return err;

		}

	}

	return 0;

}



void z_erofs_exit_decompressor(void)

{

	int i;



	for (i = 0; i < Z_EROFS_COMPRESSION_MAX; ++i)

		if (z_erofs_decomp[i])

			z_erofs_decomp[i]->exit();

}

fs/erofs/decompressor_deflate.c

+4 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static DECLARE_WAIT_QUEUE_HEAD(z_erofs_deflate_wq); 


module_param_named(deflate_streams, z_erofs_deflate_nstrms, uint, 0444);



void z_erofs_deflate_exit(void)

static void z_erofs_deflate_exit(void)

{

	/* there should be no running fs instance */

	while (z_erofs_deflate_avail_strms) {
@@ -41,7 +41,7 @@ void z_erofs_deflate_exit(void) 
	}

}



int __init z_erofs_deflate_init(void)

static int __init z_erofs_deflate_init(void)

{

	/* by default, use # of possible CPUs instead */

	if (!z_erofs_deflate_nstrms)
@@ -256,5 +256,7 @@ static int z_erofs_deflate_decompress(struct z_erofs_decompress_req *rq, 
const struct z_erofs_decompressor z_erofs_deflate_decomp = {

	.config = z_erofs_load_deflate_config,

	.decompress = z_erofs_deflate_decompress,

	.init = z_erofs_deflate_init,

	.exit = z_erofs_deflate_exit,

	.name = "deflate",

};

fs/erofs/decompressor_lzma.c

+4 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static DECLARE_WAIT_QUEUE_HEAD(z_erofs_lzma_wq); 


module_param_named(lzma_streams, z_erofs_lzma_nstrms, uint, 0444);



void z_erofs_lzma_exit(void)

static void z_erofs_lzma_exit(void)

{

	/* there should be no running fs instance */

	while (z_erofs_lzma_avail_strms) {
@@ -46,7 +46,7 @@ void z_erofs_lzma_exit(void) 
	}

}



int __init z_erofs_lzma_init(void)

static int __init z_erofs_lzma_init(void)

{

	unsigned int i;
@@ -297,5 +297,7 @@ static int z_erofs_lzma_decompress(struct z_erofs_decompress_req *rq, 
const struct z_erofs_decompressor z_erofs_lzma_decomp = {

	.config = z_erofs_load_lzma_config,

	.decompress = z_erofs_lzma_decompress,

	.init = z_erofs_lzma_init,

	.exit = z_erofs_lzma_exit,

	.name = "lzma"

};

fs/erofs/decompressor_zstd.c

+4 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static struct z_erofs_zstd *z_erofs_isolate_strms(bool all) 
	return strm;

}



void z_erofs_zstd_exit(void)

static void z_erofs_zstd_exit(void)

{

	while (z_erofs_zstd_avail_strms) {

		struct z_erofs_zstd *strm, *n;
@@ -49,7 +49,7 @@ void z_erofs_zstd_exit(void) 
	}

}



int __init z_erofs_zstd_init(void)

static int __init z_erofs_zstd_init(void)

{

	/* by default, use # of possible CPUs instead */

	if (!z_erofs_zstd_nstrms)
@@ -281,5 +281,7 @@ static int z_erofs_zstd_decompress(struct z_erofs_decompress_req *rq, 
const struct z_erofs_decompressor z_erofs_zstd_decomp = {

	.config = z_erofs_load_zstd_config,

	.decompress = z_erofs_zstd_decompress,

	.init = z_erofs_zstd_init,

	.exit = z_erofs_zstd_exit,

	.name = "zstd",

};