From: Gao Xiang Date: Fri, 14 Oct 2022 06:49:15 +0000 (+0800) Subject: erofs: fix up inplace decompression success rate X-Git-Tag: v6.0.7~107 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=913fd33114e79561bc8626405ebbd831f7068d87;p=thirdparty%2Fkernel%2Fstable.git erofs: fix up inplace decompression success rate [ Upstream commit e7933278b442f97809b1ea84264586302bd08a03 ] Partial decompression should be checked after updating length. It's a new regression when introducing multi-reference pclusters. Fixes: 2bfab9c0edac ("erofs: record the longest decompressed size in this round") Reviewed-by: Chao Yu Signed-off-by: Gao Xiang Link: https://lore.kernel.org/r/20221014064915.8103-1-hsiangkao@linux.alibaba.com Signed-off-by: Sasha Levin --- diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 6e663275aeb13..c7511b4317763 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -765,13 +765,13 @@ retry: if (fe->pcl->pageofs_out != (map->m_la & ~PAGE_MASK)) fe->pcl->multibases = true; - if ((map->m_flags & EROFS_MAP_FULL_MAPPED) && - fe->pcl->length == map->m_llen) - fe->pcl->partial = false; if (fe->pcl->length < offset + end - map->m_la) { fe->pcl->length = offset + end - map->m_la; fe->pcl->pageofs_out = map->m_la & ~PAGE_MASK; } + if ((map->m_flags & EROFS_MAP_FULL_MAPPED) && + fe->pcl->length == map->m_llen) + fe->pcl->partial = false; next_part: /* shorten the remaining extent to update progress */ map->m_llen = offset + cur - map->m_la;