From 96a59540090c6376553ff6cd5a042efea53d2d50 Mon Sep 17 00:00:00 2001 From: Gao Xiang Date: Sun, 3 Oct 2021 12:46:55 +0800 Subject: erofs-utils: clevel set up as an individual function Compression level passed in can be verified then. Also, in order for preparation of upcoming LZMA fixed-sized output compression. Link: https://lore.kernel.org/r/20211003044655.9991-1-xiang@kernel.org Signed-off-by: Gao Xiang --- lib/compress.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/compress.c') diff --git a/lib/compress.c b/lib/compress.c index 36c6a28..6ca5bed 100644 --- a/lib/compress.c +++ b/lib/compress.c @@ -20,8 +20,6 @@ #include "erofs/compress_hints.h" static struct erofs_compress compresshandle; -static int compressionlevel; - static unsigned int algorithmtype[2]; struct z_erofs_vle_compress_ctx { @@ -190,8 +188,7 @@ static int vle_compress_one(struct erofs_inode *inode, } count = min(len, cfg.c_max_decompressed_extent_bytes); - ret = erofs_compress_destsize(h, compressionlevel, - ctx->queue + ctx->head, + ret = erofs_compress_destsize(h, ctx->queue + ctx->head, &count, dst, pclustersize); if (ret <= 0) { if (ret != -EAGAIN) { @@ -645,9 +642,9 @@ int z_erofs_compress_init(struct erofs_buffer_head *sb_bh) if (!cfg.c_compr_alg_master) return 0; - compressionlevel = cfg.c_compr_level_master < 0 ? - compresshandle.alg->default_level : - cfg.c_compr_level_master; + ret = erofs_compressor_setlevel(&compresshandle, cfg.c_compr_level_master); + if (ret) + return ret; /* figure out primary algorithm */ ret = erofs_get_compress_algorithm_id(cfg.c_compr_alg_master); -- cgit v1.2.3