may_packing in __z_erofs_compress_one() is still bypassed when multi-threaded
compression is enabled, which is unexpected.
Furthermore, multi-threaded -Eall-fragments,ztailpacking can sometimes corrupt
images. Let's fix it.
Fixes: 882ad1c3157f ("erofs-utils: mkfs: fix `-Eall-fragments` for
multi-threaded compression")
Fixes: 10c1590c0920 ("erofs-utils: enable multi-threaded support for
`-Eall-fragments`")
Signed-off-by: Gao Xiang <[email protected]>
---
lib/compress.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/compress.c b/lib/compress.c
index 6ac9c75..fd4c241 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -565,8 +565,7 @@ static int __z_erofs_compress_one(struct
z_erofs_compress_sctx *ctx,
unsigned int len = ctx->tail - ctx->head;
bool is_packed_inode = erofs_is_packed_inode(inode);
bool tsg = (ctx->seg_idx + 1 >= ictx->seg_num), final = !ctx->remaining;
- bool may_packing = (cfg.c_fragments && tsg && final &&
- !is_packed_inode && !z_erofs_mt_enabled);
+ bool may_packing = (cfg.c_fragments && tsg && final &&
!is_packed_inode);
bool may_inline = (cfg.c_ztailpacking && tsg && final && !may_packing);
unsigned int compressedsize;
int ret;
--
2.43.5
