Commit 7e508f2c authored by Huang Jianan's avatar Huang Jianan Committed by Gao Xiang
Browse files

erofs: rename lz4_0pading to zero_padding 

Renaming lz4_0padding to zero_padding globally since LZMA and later
algorithms also need that.

Link: https://lore.kernel.org/r/20211112160935.19394-1-jnhuang95@gmail.com


Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarHuang Jianan <huangjianan@oppo.com>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent d58071a8

fs/erofs/decompressor.c

+2 −2
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ static int z_erofs_lz4_decompress_mem(struct z_erofs_decompress_req *rq, 
	inputmargin = 0;

	support_0padding = false;



	/* decompression inplace is only safe when 0padding is enabled */

	if (erofs_sb_has_lz4_0padding(EROFS_SB(rq->sb))) {

	/* decompression inplace is only safe when zero_padding is enabled */

	if (erofs_sb_has_zero_padding(EROFS_SB(rq->sb))) {

		support_0padding = true;



		while (!headpage[inputmargin & ~PAGE_MASK])

fs/erofs/erofs_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ 
 * Any bits that aren't in EROFS_ALL_FEATURE_INCOMPAT should

 * be incompatible with this kernel version.

 */

#define EROFS_FEATURE_INCOMPAT_LZ4_0PADDING	0x00000001

#define EROFS_FEATURE_INCOMPAT_ZERO_PADDING	0x00000001

#define EROFS_FEATURE_INCOMPAT_COMPR_CFGS	0x00000002

#define EROFS_FEATURE_INCOMPAT_BIG_PCLUSTER	0x00000002

#define EROFS_FEATURE_INCOMPAT_CHUNKED_FILE	0x00000004

#define EROFS_FEATURE_INCOMPAT_DEVICE_TABLE	0x00000008

#define EROFS_FEATURE_INCOMPAT_COMPR_HEAD2	0x00000008

#define EROFS_ALL_FEATURE_INCOMPAT		\

	(EROFS_FEATURE_INCOMPAT_LZ4_0PADDING | \

	(EROFS_FEATURE_INCOMPAT_ZERO_PADDING | \

	 EROFS_FEATURE_INCOMPAT_COMPR_CFGS | \

	 EROFS_FEATURE_INCOMPAT_BIG_PCLUSTER | \

	 EROFS_FEATURE_INCOMPAT_CHUNKED_FILE | \

fs/erofs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static inline bool erofs_sb_has_##name(struct erofs_sb_info *sbi) \ 
	return sbi->feature_##compat & EROFS_FEATURE_##feature; \

}



EROFS_FEATURE_FUNCS(lz4_0padding, incompat, INCOMPAT_LZ4_0PADDING)

EROFS_FEATURE_FUNCS(zero_padding, incompat, INCOMPAT_ZERO_PADDING)

EROFS_FEATURE_FUNCS(compr_cfgs, incompat, INCOMPAT_COMPR_CFGS)

EROFS_FEATURE_FUNCS(big_pcluster, incompat, INCOMPAT_BIG_PCLUSTER)

EROFS_FEATURE_FUNCS(device_table, incompat, INCOMPAT_DEVICE_TABLE)