Commit c40dd3ca authored by Yue Hu's avatar Yue Hu Committed by Gao Xiang
Browse files

erofs: clear compacted_2b if compacted_4b_initial > totalidx 

Currently, the whole indexes will only be compacted 4B if
compacted_4b_initial > totalidx. So, the calculated compacted_2b
is worthless for that case. It may waste CPU resources.

No need to update compacted_4b_initial as mkfs since it's used to
fulfill the alignment of the 1st compacted_2b pack and would handle
the case above.

We also need to clarify compacted_4b_end here. It's used for the
last lclusters which aren't fitted in the previous compacted_2b
packs.

Some messages are from Xiang.

Link: https://lore.kernel.org/r/20210914035915.1190-1-zbestahu@gmail.com


Signed-off-by: default avatarYue Hu <huyue2@yulong.com>
Reviewed-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
[ Gao Xiang: it's enough to use "compacted_4b_initial < totalidx". ]
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent d705117d

fs/erofs/zmap.c

+2 −1
Original line number Diff line number Diff line
@@ -369,7 +369,8 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, 
	if (compacted_4b_initial == 32 / 4)

		compacted_4b_initial = 0;



	if (vi->z_advise & Z_EROFS_ADVISE_COMPACTED_2B)

	if ((vi->z_advise & Z_EROFS_ADVISE_COMPACTED_2B) &&

	    compacted_4b_initial < totalidx)

		compacted_2b = rounddown(totalidx - compacted_4b_initial, 16);

	else

		compacted_2b = 0;