erofs: fix up inplace decompression success rate
PATCH 1/1 erofs: fix up inplace decompression success rate
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")
Signed-off-by Gao Xiang <[email protected]>
--- fs/erofs/zdata.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/erofs/zdata.c +4 -5
@@ -812,15 +812,14 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe, ++spiltted;if (fe->pcl->pageofs_out != (map->m_la & ~PAGE_MASK )) fe->pcl->multibases = true; - -if ((map->m_flags &EROFS_MAP_FULL_MAPPED ) && - !(map->m_flags &EROFS_MAP_PARTIAL_REF ) && - 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 ) && + !(map->m_flags &EROFS_MAP_PARTIAL_REF ) && + 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;
Signature · 1 line
2.24.4
Quoted 5 lines · Gao Xiang
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")Signed-off-by Gao Xiang <[email protected]>
Reviewed-by Chao Yu <[email protected]>
Thanks,