Commit e7933278 authored by Gao Xiang's avatar Gao Xiang
Browse files

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: 2bfab9c0 ("erofs: record the longest decompressed size in this round")
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20221014064915.8103-1-hsiangkao@linux.alibaba.com
parent 63bbb856

fs/erofs/zdata.c

+4 −5
Original line number Diff line number Diff line
@@ -813,15 +813,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;