Unverified Commit 51740b55 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14789 erofs: handle NONHEAD !delta[1 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PLLTFIROGW2T2U7IN42QRY7MGJTKM346/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEAED 
 
Link:https://gitee.com/openeuler/kernel/pulls/14789

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 1ed9ff88 8d64b06d

fs/erofs/zmap.c

+9 −8
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, 
	unsigned int amortizedshift;

	erofs_off_t pos;



	if (lcn >= totalidx)

	if (lcn >= totalidx || vi->z_logical_clusterbits > 14)

		return -EINVAL;



	m->lcn = lcn;
@@ -409,7 +409,7 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m) 
	u64 lcn = m->lcn, headlcn = map->m_la >> lclusterbits;

	int err;



	do {

	while (1) {

		/* handle the last EOF pcluster (no next HEAD lcluster) */

		if ((lcn << lclusterbits) >= inode->i_size) {

			map->m_llen = inode->i_size - map->m_la;
@@ -421,14 +421,16 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m) 
			return err;



		if (m->type == Z_EROFS_LCLUSTER_TYPE_NONHEAD) {

			DBG_BUGON(!m->delta[1] &&

				  m->clusterofs != 1 << lclusterbits);

			/* work around invalid d1 generated by pre-1.0 mkfs */

			if (unlikely(!m->delta[1])) {

				m->delta[1] = 1;

				DBG_BUGON(1);

			}

		} else if (m->type == Z_EROFS_LCLUSTER_TYPE_PLAIN ||

			   m->type == Z_EROFS_LCLUSTER_TYPE_HEAD1 ||

			   m->type == Z_EROFS_LCLUSTER_TYPE_HEAD2) {

			/* go on until the next HEAD lcluster */

			if (lcn != headlcn)

				break;

				break;	/* ends at the next HEAD lcluster */

			m->delta[1] = 1;

		} else {

			erofs_err(inode->i_sb, "unknown type %u @ lcn %llu of nid %llu",
@@ -437,8 +439,7 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m) 
			return -EOPNOTSUPP;

		}

		lcn += m->delta[1];

	} while (m->delta[1]);



	}

	map->m_llen = (lcn << lclusterbits) + m->clusterofs - map->m_la;

	return 0;

}