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

erofs: fix ztailpacking for subpage compressed blocks 



`pageofs_in` should be the compressed data offset of the page rather
than of the block.

Acked-by: default avatarChao Yu <chao@kernel.org>
Reviewed-by: default avatarYue Hu <huyue2@coolpad.com>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20231214161337.753049-1-hsiangkao@linux.alibaba.com
parent 8d2517aa

fs/erofs/zdata.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,6 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe) 


	if (ztailpacking) {

		pcl->obj.index = 0;	/* which indicates ztailpacking */

		pcl->pageofs_in = erofs_blkoff(fe->inode->i_sb, map->m_pa);

	} else {

		pcl->obj.index = erofs_blknr(sb, map->m_pa);
@@ -887,6 +886,7 @@ static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe) 
		}

		get_page(map->buf.page);

		WRITE_ONCE(fe->pcl->compressed_bvecs[0].page, map->buf.page);

		fe->pcl->pageofs_in = map->m_pa & ~PAGE_MASK;

		fe->mode = Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE;

	}

	/* file-backed inplace I/O pages are traversed in reverse order */