Commit 06ec0366 authored by Gao Xiang's avatar Gao Xiang
Browse files

erofs: get rid of fe->backmost for cache decompression 



EROFS_MAP_FULL_MAPPED is more accurate to decide if caching the last
incomplete pcluster for later read or not.

Reviewed-by: default avatarYue Hu <huyue2@coolpad.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20230817082813.81180-6-hsiangkao@linux.alibaba.com
parent 9a05c6a8

fs/erofs/zdata.c

+2 −5
Original line number Diff line number Diff line
@@ -528,8 +528,6 @@ struct z_erofs_decompress_frontend { 
	z_erofs_next_pcluster_t owned_head;

	enum z_erofs_pclustermode mode;



	/* used for applying cache strategy on the fly */

	bool backmost;

	erofs_off_t headoffset;



	/* a pointer used to pick up inplace I/O pages */
@@ -538,7 +536,7 @@ struct z_erofs_decompress_frontend { 


#define DECOMPRESS_FRONTEND_INIT(__i) { \

	.inode = __i, .owned_head = Z_EROFS_PCLUSTER_TAIL, \

	.mode = Z_EROFS_PCLUSTER_FOLLOWED, .backmost = true }

	.mode = Z_EROFS_PCLUSTER_FOLLOWED }



static bool z_erofs_should_alloc_cache(struct z_erofs_decompress_frontend *fe)

{
@@ -547,7 +545,7 @@ static bool z_erofs_should_alloc_cache(struct z_erofs_decompress_frontend *fe) 
	if (cachestrategy <= EROFS_ZIP_CACHE_DISABLED)

		return false;



	if (fe->backmost)

	if (!(fe->map.m_flags & EROFS_MAP_FULL_MAPPED))

		return true;



	if (cachestrategy >= EROFS_ZIP_CACHE_READAROUND &&
@@ -940,7 +938,6 @@ static void z_erofs_pcluster_end(struct z_erofs_decompress_frontend *fe) 
		erofs_workgroup_put(&pcl->obj);



	fe->pcl = NULL;

	fe->backmost = false;

}



static int z_erofs_read_fragment(struct super_block *sb, struct page *page,