erofs: do sanity check on m->type in z_erofs_load_compact_lcluster()
Chao Yu
maintainerPATCH 1/1 erofs: do sanity check on m->type in z_erofs_load_compact_lcluster()
All below functions will do sanity check on m->type, let's move sanity check to z_erofs_load_compact_lcluster() for cleanup.
- z_erofs_map_blocks_fo
- z_erofs_get_extent_compressedlen
- z_erofs_get_extent_decompressedlen
- z_erofs_extent_lookback
--- fs/erofs/zmap.c | 60 ++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-)
fs/erofs/zmap.c +22 -38
@@ -240,6 +240,13 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,static int z_erofs_load_lcluster_from_disk (struct z_erofs_maprecorder *m,unsigned int lcn,bool lookahead) { +if (m->type >=Z_EROFS_LCLUSTER_TYPE_MAX ) { +erofs_err (m->inode->i_sb,"unknown type %u @ lcn %u of nid %llu" , + m->type, lcn,EROFS_I (m->inode)->nid); +DBG_BUGON (1 ); +return -EOPNOTSUPP ; + } +switch (EROFS_I (m->inode)->datalayout) {case EROFS_INODE_COMPRESSED_FULL :return z_erofs_load_full_lcluster (m, lcn);
@@ -265,12 +272,7 @@ static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,if (err)return err; -if (m->type >=Z_EROFS_LCLUSTER_TYPE_MAX ) { -erofs_err (sb,"unknown type %u @ lcn %lu of nid %llu" , - m->type, lcn, vi->nid); -DBG_BUGON (1 ); -return -EOPNOTSUPP ; - }else if (m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { +if (m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { lookback_distance = m->delta[0 ];if (!lookback_distance)break ;
@@ -333,17 +335,13 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m, }if (m->compressedblks) goto out; - }else if (m->type <Z_EROFS_LCLUSTER_TYPE_MAX ) { -/* -* if the 1st NONHEAD lcluster is actually PLAIN or HEAD type -* rather than CBLKCNT, it's a 1 block-sized pcluster. -*/ - m->compressedblks =1 ; - goto out; } -erofs_err (sb,"cannot found CBLKCNT @ lcn %lu of nid %llu" , lcn, vi->nid); -DBG_BUGON (1 ); -return -EFSCORRUPTED ; + +/* +* if the 1st NONHEAD lcluster is actually PLAIN or HEAD type rather +* than CBLKCNT, it's a 1 block-sized pcluster. +*/ + m->compressedblks =1 ; out: m->map->m_plen =erofs_pos (sb, m->compressedblks);return 0 ;
@@ -379,11 +377,6 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m)if (lcn != headlcn)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" , - m->type, lcn, vi->nid); -DBG_BUGON (1 ); -return -EOPNOTSUPP ; } lcn += m->delta[1 ]; }
@@ -429,10 +422,7 @@ static int z_erofs_map_blocks_fo(struct inode *inode, map->m_flags =EROFS_MAP_MAPPED |EROFS_MAP_ENCODED ; end = (m.lcn +1ULL ) << lclusterbits; -switch (m.type) { -case Z_EROFS_LCLUSTER_TYPE_PLAIN : -case Z_EROFS_LCLUSTER_TYPE_HEAD1 : -case Z_EROFS_LCLUSTER_TYPE_HEAD2 : +if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD ) {if (endoff >= m.clusterofs) { m.headtype = m.type; map->m_la = (m.lcn << lclusterbits) | m.clusterofs;
@@ -443,7 +433,7 @@ static int z_erofs_map_blocks_fo(struct inode *inode,*/ if (ztailpacking && end > inode->i_size) end = inode->i_size; -break ; + goto map_block; }/* m.lcn should be >= 1 if endoff < m.clusterofs */ if (!m.lcn) {
@@ -455,19 +445,13 @@ static int z_erofs_map_blocks_fo(struct inode *inode, end = (m.lcn << lclusterbits) | m.clusterofs; map->m_flags |=EROFS_MAP_FULL_MAPPED ; m.delta[0 ] =1 ; - fallthrough; -case Z_EROFS_LCLUSTER_TYPE_NONHEAD : -/* get the corresponding first chunk */ - err =z_erofs_extent_lookback (&m, m.delta[0 ]); -if (err) - goto unmap_out; -break ; -default : -erofs_err (sb,"unknown type %u @ offset %llu of nid %llu" , - m.type, ofs, vi->nid); - err = -EOPNOTSUPP ; - goto unmap_out; } + +/* get the corresponding first chunk */ + err =z_erofs_extent_lookback (&m, m.delta[0 ]); +if (err) + goto unmap_out; +map_block:if (m.partialref) map->m_flags |=EROFS_MAP_PARTIAL_REF ; map->m_llen = end - map->m_la;
Signature · 1 line
2.49.0
Quoted 17 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookbackSigned-off-by Chao Yu <[email protected]>--- fs/erofs/zmap.c | 60 ++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 38 deletions(-)fs/erofs/zmap.c +0
-0
fs/erofs/zmap.c static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, · line 249
Quoted 10 lines
fs/erofs/zmap.c +7
-0@@ -240,6 +240,13 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,static int z_erofs_load_lcluster_from_disk (struct z_erofs_maprecorder *m,unsigned int lcn,bool lookahead) { +if (m->type >=Z_EROFS_LCLUSTER_TYPE_MAX ) { +erofs_err (m->inode->i_sb,"unknown type %u @ lcn %u of nid %llu" , + m->type, lcn,EROFS_I (m->inode)->nid); +DBG_BUGON (1 ); +return -EOPNOTSUPP ; + } +
Hi, Chao,
After moving the condition in here, there is no need to check in z_erofs_extent_lookback, z_erofs_get_extent_compressedlen and z_erofs_get_extent_decompressedlen. Because in z_erofs_map_blocks_fo, the condition has been checked in before. Right?
Thanks,
Hongbo
Quoted 100 lines
fs/erofs/zmap.c +15
-38switch (EROFS_I (m->inode)->datalayout) {case EROFS_INODE_COMPRESSED_FULL :return z_erofs_load_full_lcluster (m, lcn);@@ -265,12 +272,7 @@ static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,if (err)return err; -if (m->type >=Z_EROFS_LCLUSTER_TYPE_MAX ) { -erofs_err (sb,"unknown type %u @ lcn %lu of nid %llu" , - m->type, lcn, vi->nid); -DBG_BUGON (1 ); -return -EOPNOTSUPP ; - }else if (m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { +if (m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { lookback_distance = m->delta[0 ];if (!lookback_distance)break ;@@ -333,17 +335,13 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m, }if (m->compressedblks) goto out; - }else if (m->type <Z_EROFS_LCLUSTER_TYPE_MAX ) { -/* -* if the 1st NONHEAD lcluster is actually PLAIN or HEAD type -* rather than CBLKCNT, it's a 1 block-sized pcluster. -*/ - m->compressedblks =1 ; - goto out; } -erofs_err (sb,"cannot found CBLKCNT @ lcn %lu of nid %llu" , lcn, vi->nid); -DBG_BUGON (1 ); -return -EFSCORRUPTED ; + +/* +* if the 1st NONHEAD lcluster is actually PLAIN or HEAD type rather +* than CBLKCNT, it's a 1 block-sized pcluster. +*/ + m->compressedblks =1 ; out: m->map->m_plen =erofs_pos (sb, m->compressedblks);return 0 ;@@ -379,11 +377,6 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m)if (lcn != headlcn)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" , - m->type, lcn, vi->nid); -DBG_BUGON (1 ); -return -EOPNOTSUPP ; } lcn += m->delta[1 ]; }@@ -429,10 +422,7 @@ static int z_erofs_map_blocks_fo(struct inode *inode, map->m_flags =EROFS_MAP_MAPPED |EROFS_MAP_ENCODED ; end = (m.lcn +1ULL ) << lclusterbits; -switch (m.type) { -case Z_EROFS_LCLUSTER_TYPE_PLAIN : -case Z_EROFS_LCLUSTER_TYPE_HEAD1 : -case Z_EROFS_LCLUSTER_TYPE_HEAD2 : +if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD ) {if (endoff >= m.clusterofs) { m.headtype = m.type; map->m_la = (m.lcn << lclusterbits) | m.clusterofs;@@ -443,7 +433,7 @@ static int z_erofs_map_blocks_fo(struct inode *inode,*/ if (ztailpacking && end > inode->i_size) end = inode->i_size; -break ; + goto map_block; }/* m.lcn should be >= 1 if endoff < m.clusterofs */ if (!m.lcn) {@@ -455,19 +445,13 @@ static int z_erofs_map_blocks_fo(struct inode *inode, end = (m.lcn << lclusterbits) | m.clusterofs; map->m_flags |=EROFS_MAP_FULL_MAPPED ; m.delta[0 ] =1 ; - fallthrough; -case Z_EROFS_LCLUSTER_TYPE_NONHEAD : -/* get the corresponding first chunk */ - err =z_erofs_extent_lookback (&m, m.delta[0 ]); -if (err) - goto unmap_out; -break ; -default : -erofs_err (sb,"unknown type %u @ offset %llu of nid %llu" , - m.type, ofs, vi->nid); - err = -EOPNOTSUPP ; - goto unmap_out; } + +/* get the corresponding first chunk */ + err =z_erofs_extent_lookback (&m, m.delta[0 ]); +if (err) + goto unmap_out; +map_block:if (m.partialref) map->m_flags |=EROFS_MAP_PARTIAL_REF ; map->m_llen = end - map->m_la;
Hongbo Li
Reviewed-byQuoted 35 lines · Hongbo Li
Quoted 19 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookbackSigned-off-by Chao Yu <[email protected]>---
fs/erofs/zmap.c| 60 ++++++++++++++++++-------------------------------1 file changed, 22 insertions(+), 38 deletions(-)fs/erofs/zmap.c +0
-0@@ -240,6 +240,13 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m,fs/erofs/zmap.c static int z_erofs_load_compact_lcluster(struct · line 251
Quoted 10 lines
fs/erofs/zmap.c +7
-0unsigned int lcn, bool lookahead) { + if (m->type >= Z_EROFS_LCLUSTER_TYPE_MAX) { + erofs_err(m->inode->i_sb, "unknown type %u @ lcn %u of nid %llu", + m->type, lcn, EROFS_I(m->inode)->nid); + DBG_BUGON(1); + return -EOPNOTSUPP; + } +Hi, Chao,
Quoted 2 lines
After moving the condition in here, there is no need to check in
z_erofs_extent_lookback,z_erofs_get_extent_compressedlenandz_erofs_get_extent_decompressedlen. Because inz_erofs_map_blocks_fo, the condition has been checked in before. Right?
So,
Thanks,
Hongbo
Quoted 109 lines
Thanks,
HongboQuoted 105 lines
fs/erofs/zmap.c +0
-0switch (EROFS_I(m->inode)->datalayout) {case
EROFS_INODE_COMPRESSED_FULL:
returnz_erofs_load_full_lcluster(m, lcn);fs/erofs/zmap.c +7
-16@@ -265,12 +272,7 @@ static int z_erofs_extent_lookback(structz_erofs_maprecorder *m, if (err) return err; - if (m->type >= Z_EROFS_LCLUSTER_TYPE_MAX) { - erofs_err(sb, "unknown type %u @ lcn %lu of nid %llu", - m->type, lcn, vi->nid); - DBG_BUGON(1); - return -EOPNOTSUPP; - } else if (m->type == Z_EROFS_LCLUSTER_TYPE_NONHEAD) { + if (m->type == Z_EROFS_LCLUSTER_TYPE_NONHEAD) { lookback_distance = m->delta[0]; if (!lookback_distance) break;@@ -333,17 +335,13 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m, } if (m->compressedblks) goto out; - } else if (m->type < Z_EROFS_LCLUSTER_TYPE_MAX) { - /* - * if the 1st NONHEAD lcluster is actually PLAIN or HEAD type - * rather than CBLKCNT, it's a 1 block-sized pcluster. - */ - m->compressedblks = 1; - goto out; } - erofs_err(sb, "cannot found CBLKCNT @ lcn %lu of nid %llu", lcn, vi->nid); - DBG_BUGON(1); - return -EFSCORRUPTED; + + /* + * if the 1st NONHEAD lcluster is actually PLAIN or HEAD type rather + * than CBLKCNT, it's a 1 block-sized pcluster. + */ + m->compressedblks = 1;out:
m->map->m_plen=erofs_pos(sb, m->compressedblks); return 0;fs/erofs/zmap.c +0
-0@@ -379,11 +377,6 @@ static int z_erofs_get_extent_decompressedlen(struct z_erofs_maprecorder *m) if (lcn != headlcn)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",
-m->type, lcn,vi->nid);
-DBG_BUGON(1);
- return-EOPNOTSUPP;
}
lcn += m->delta[1];
}fs/erofs/zmap.c +8
-17@@ -429,10 +422,7 @@ static int z_erofs_map_blocks_fo(struct inode *inode, map->m_flags = EROFS_MAP_MAPPED | EROFS_MAP_ENCODED; end = (m.lcn + 1ULL) << lclusterbits; - switch (m.type) { - case Z_EROFS_LCLUSTER_TYPE_PLAIN: - case Z_EROFS_LCLUSTER_TYPE_HEAD1: - case Z_EROFS_LCLUSTER_TYPE_HEAD2: + if (m.type != Z_EROFS_LCLUSTER_TYPE_NONHEAD) { if (endoff >= m.clusterofs) { m.headtype = m.type; map->m_la = (m.lcn << lclusterbits) | m.clusterofs;@@ -443,7 +433,7 @@ static int z_erofs_map_blocks_fo(struct inode *inode,*/ if (ztailpacking && end > inode->i_size) end = inode->i_size; - break; + goto map_block; } /* m.lcn should be >= 1 if endoff < m.clusterofs */ if (!m.lcn) {@@ -455,19 +445,13 @@ static int z_erofs_map_blocks_fo(struct inode *inode, end = (m.lcn << lclusterbits) | m.clusterofs; map->m_flags |= EROFS_MAP_FULL_MAPPED; m.delta[0] = 1; - fallthrough; - case Z_EROFS_LCLUSTER_TYPE_NONHEAD: - /* get the corresponding first chunk */ - err = z_erofs_extent_lookback(&m, m.delta[0]); - if (err) - goto unmap_out; - break; - default: - erofs_err(sb, "unknown type %u @ offset %llu of nid %llu", - m.type, ofs, vi->nid); - err = -EOPNOTSUPP; - goto unmap_out; } + + /* get the corresponding first chunk */ + err = z_erofs_extent_lookback(&m, m.delta[0]); + if (err) + goto unmap_out; +map_block: if (m.partialref) map->m_flags |= EROFS_MAP_PARTIAL_REF;
map->m_llen= end -map->m_la;
Quoted 33 lines · Hongbo Li
Quoted 17 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookbackSigned-off-by Chao Yu <[email protected]>---
fs/erofs/zmap.c| 60 ++++++++++++++++++-------------------------------1 file changed, 22 insertions(+), 38 deletions(-)fs/erofs/zmap.c +0
-0fs/erofs/zmap.c static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, · line 249
Quoted 10 lines
fs/erofs/zmap.c +7
-0@@ -240,6 +240,13 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m, unsigned int lcn, bool lookahead) { + if (m->type >= Z_EROFS_LCLUSTER_TYPE_MAX) { + erofs_err(m->inode->i_sb, "unknown type %u @ lcn %u of nid %llu", + m->type, lcn, EROFS_I(m->inode)->nid); + DBG_BUGON(1); + return -EOPNOTSUPP; + } +Hi, Chao,
Quoted 1 line
After moving the condition in here, there is no need to check in
z_erofs_extent_lookback,z_erofs_get_extent_compressedlenandz_erofs_get_extent_decompressedlen. Because inz_erofs_map_blocks_fo, the condition has been checked in before. Right?
I've replied some similar question.
Because z_erofs_get_extent_compressedlen and z_erofs_get_extent_decompressedlen() use the different lcn (lcluster) against z_erofs_map_blocks_fo().
So if a new lcn(lcluster number) is loaded, we'd check if the type is valid.
Thanks,
Gao Xiang
Quoted 38 lines · Gao Xiang
Quoted 35 lines · Hongbo Li
Quoted 19 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookbackSigned-off-by Chao Yu <[email protected]>---
fs/erofs/zmap.c| 60 ++++++++++++++++++-------------------------------1 file changed, 22 insertions(+), 38 deletions(-)fs/erofs/zmap.c +0
-0@@ -240,6 +240,13 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m,fs/erofs/zmap.c static int z_erofs_load_compact_lcluster(struct · line 251
Quoted 10 lines
fs/erofs/zmap.c +7
-0unsigned int lcn, bool lookahead) { + if (m->type >= Z_EROFS_LCLUSTER_TYPE_MAX) { + erofs_err(m->inode->i_sb, "unknown type %u @ lcn %u of nid %llu", + m->type, lcn, EROFS_I(m->inode)->nid); + DBG_BUGON(1); + return -EOPNOTSUPP; + } +Hi, Chao,
Quoted 9 lines
Quoted 1 line
After moving the condition in here, there is no need to check in
z_erofs_extent_lookback,z_erofs_get_extent_compressedlenandz_erofs_get_extent_decompressedlen. Because inz_erofs_map_blocks_fo, the condition has been checked in before. Right?I've replied some similar question.
Because
z_erofs_get_extent_compressedlenandz_erofs_get_extent_decompressedlen()use the different lcn (lcluster) againstz_erofs_map_blocks_fo().So if a new lcn(lcluster number) is loaded, we'd check if the type is valid.
Ok, the type will change after loading.
Thanks,
Hongbo
Quoted 3 lines
Thanks,
Gao Xiang
Chao Yu
maintainerQuoted 39 lines · Gao Xiang
Quoted 33 lines · Hongbo Li
Quoted 17 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookbackSigned-off-by Chao Yu <[email protected]>---
fs/erofs/zmap.c| 60 ++++++++++++++++++-------------------------------1 file changed, 22 insertions(+), 38 deletions(-)fs/erofs/zmap.c +0
-0fs/erofs/zmap.c static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, · line 249
Quoted 10 lines
fs/erofs/zmap.c +7
-0@@ -240,6 +240,13 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m, static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m, unsigned int lcn, bool lookahead) { + if (m->type >= Z_EROFS_LCLUSTER_TYPE_MAX) { + erofs_err(m->inode->i_sb, "unknown type %u @ lcn %u of nid %llu", + m->type, lcn, EROFS_I(m->inode)->nid); + DBG_BUGON(1); + return -EOPNOTSUPP; + } +Hi, Chao,
Quoted 2 lines
After moving the condition in here, there is no need to check in
z_erofs_extent_lookback,z_erofs_get_extent_compressedlenandz_erofs_get_extent_decompressedlen. Because inz_erofs_map_blocks_fo, the condition has been checked in before. Right?
Quoted 6 lines
I've replied some similar question.
Because
z_erofs_get_extent_compressedlenandz_erofs_get_extent_decompressedlen()use the different lcn (lcluster) againstz_erofs_map_blocks_fo().So if a new lcn(lcluster number) is loaded, we'd check if the type is valid.
Yeah, Xiang has noticed that previously [1], the case is as below, so we'd better check the condition in z_erofs_load_compact_lcluster() rather than z_erofs_map_blocks_fo():
- z_erofs_extent_lookback
- z_erofs_load_lcluster_from_disk
- z_erofs_load_full_lcluster
: m->type = advise & Z_EROFS_LI_LCLUSTER_TYPE_MASK;
- z_erofs_load_compact_lcluster
: m->type = type;
[1] https://lore.kernel.org/linux-erofs/[email protected]/
Thanks,
Quoted 5 lines
Thanks,
Gao Xiang
Hi Chao,
Quoted 8 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookbackSigned-off-by Chao Yu <[email protected]>
How about appending the following diff to tidy up the code a bit further (avoid goto map_block and goto out)?
fs/erofs/zmap.c | 67 +++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 36 deletions(-)
fs/erofs/zmap.c +31 -36
@@ -327,21 +327,18 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m,DBG_BUGON (lcn == initial_lcn && m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD ); -if (m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { -if (m->delta[0 ] !=1 ) { -erofs_err (sb,"bogus CBLKCNT @ lcn %lu of nid %llu" , lcn, vi->nid); -DBG_BUGON (1 ); -return -EFSCORRUPTED ; - } -if (m->compressedblks) - goto out; +if (m->type ==Z_EROFS_LCLUSTER_TYPE_NONHEAD && m->delta[0 ] !=1 ) { +erofs_err (sb,"bogus CBLKCNT @ lcn %lu of nid %llu" , lcn, vi->nid); +DBG_BUGON (1 ); +return -EFSCORRUPTED ; }/* * if the 1st NONHEAD lcluster is actually PLAIN or HEAD type rather * than CBLKCNT, it's a 1 block-sized pcluster. */ - m->compressedblks =1 ; +if (m->type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD || !m->compressedblks) + m->compressedblks =1 ; out: m->map->m_plen =erofs_pos (sb, m->compressedblks);return 0 ;
@@ -422,36 +419,34 @@ static int z_erofs_map_blocks_fo(struct inode *inode, map->m_flags =EROFS_MAP_MAPPED |EROFS_MAP_ENCODED ; end = (m.lcn +1ULL ) << lclusterbits; -if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { -if (endoff >= m.clusterofs) { - m.headtype = m.type; - map->m_la = (m.lcn << lclusterbits) | m.clusterofs; -/* -* For ztailpacking files, in order to inline data more -* effectively, special EOF lclusters are now supported -* which can have three parts at most. -*/ -if (ztailpacking && end > inode->i_size) - end = inode->i_size; - goto map_block; +if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD && endoff >= m.clusterofs) { + m.headtype = m.type; + map->m_la = (m.lcn << lclusterbits) | m.clusterofs; +/* +* For ztailpacking files, in order to inline data more +* effectively, special EOF lclusters are now supported +* which can have three parts at most. +*/ +if (ztailpacking && end > inode->i_size) + end = inode->i_size; + }else { +if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD ) { +/* m.lcn should be >= 1 if endoff < m.clusterofs */ +if (!m.lcn) { +erofs_err (sb,"invalid logical cluster 0 at nid %llu" , + vi->nid); + err = -EFSCORRUPTED ; + goto unmap_out; + } + end = (m.lcn << lclusterbits) | m.clusterofs; + map->m_flags |=EROFS_MAP_FULL_MAPPED ; + m.delta[0 ] =1 ; } -/* m.lcn should be >= 1 if endoff < m.clusterofs */ -if (!m.lcn) { -erofs_err (sb,"invalid logical cluster 0 at nid %llu" , - vi->nid); - err = -EFSCORRUPTED ; +/* get the corresponding first chunk */ + err =z_erofs_extent_lookback (&m, m.delta[0 ]); +if (err) goto unmap_out; - } - end = (m.lcn << lclusterbits) | m.clusterofs; - map->m_flags |=EROFS_MAP_FULL_MAPPED ; - m.delta[0 ] =1 ; } - -/* get the corresponding first chunk */ - err =z_erofs_extent_lookback (&m, m.delta[0 ]); -if (err) - goto unmap_out; -map_block:if (m.partialref) map->m_flags |=EROFS_MAP_PARTIAL_REF ; map->m_llen = end - map->m_la;
Signature · 1 line
2.43.5
Chao Yu
maintainerQuoted 10 lines · Gao Xiang
Hi Chao,
Quoted 7 lines · Chao Yu
All below functions will do sanity check on
m->type, let's move sanity check toz_erofs_load_compact_lcluster()for cleanup.
-z_erofs_map_blocks_fo
-z_erofs_get_extent_compressedlen
-z_erofs_get_extent_decompressedlen
-z_erofs_extent_lookback
Quoted 3 lines
Quoted 1 line
Signed-off-by Chao Yu <[email protected]>How about appending the following diff to tidy up the code a bit further (avoid
goto map_blockandgoto out)?
Xiang,
Looks good to me, will append the diff in the patch.
Thanks,
Quoted 99 lines
fs/erofs/zmap.c | 67 +++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 36 deletions(-)fs/erofs/zmap.c +0
-0@@ -327,21 +327,18 @@ static int z_erofs_get_extent_compressedlen(struct z_erofs_maprecorder *m,DBG_BUGON(lcn ==
initial_lcn&&
m->type==Z_EROFS_LCLUSTER_TYPE_NONHEAD);
- if (m->type==Z_EROFS_LCLUSTER_TYPE_NONHEAD) {
- if (m->delta[0] != 1) {
-erofs_err(sb, "bogus CBLKCNT @ lcn %lu of nid %llu", lcn, vi->nid); -DBG_BUGON(1);
- return-EFSCORRUPTED;
- }
- if (m->compressedblks)
- goto out;
+ if (m->type==Z_EROFS_LCLUSTER_TYPE_NONHEAD&& m->delta[0] != 1) { +erofs_err(sb, "bogus CBLKCNT @ lcn %lu of nid %llu", lcn, vi->nid); +DBG_BUGON(1);
+ return-EFSCORRUPTED;
}
/*
* if the 1st NONHEAD lcluster is actually PLAIN or HEAD type rather
* than CBLKCNT, it's a 1 block-sized pcluster.
*/
-m->compressedblks= 1;
+ if (m->type!=Z_EROFS_LCLUSTER_TYPE_NONHEAD|| !m->compressedblks) +m->compressedblks= 1;
out:
m->map->m_plen=erofs_pos(sb, m->compressedblks);
return 0;fs/erofs/zmap.c +0
-0@@ -422,36 +419,34 @@ static int z_erofs_map_blocks_fo(struct inode *inode, map->m_flags = EROFS_MAP_MAPPED | EROFS_MAP_ENCODED; end = (m.lcn + 1ULL) << lclusterbits;
- if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD) {
- if (endoff >= m.clusterofs) {
- m.headtype = m.type;
-map->m_la= (m.lcn << lclusterbits) | m.clusterofs; - /*
- * For ztailpacking files, in order to inline data more - * effectively, special EOF lclusters are now supported - * which can have three parts at most.
- */
- if (ztailpacking && end >inode->i_size)
- end =inode->i_size;
- gotomap_block;
+ if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD&& endoff >= m.clusterofs) { + m.headtype = m.type;
+map->m_la= (m.lcn << lclusterbits) | m.clusterofs;
+ /*
+ * For ztailpacking files, in order to inline data more + * effectively, special EOF lclusters are now supported + * which can have three parts at most.
+ */
+ if (ztailpacking && end >inode->i_size)
+ end =inode->i_size;
+ } else {
+ if (m.type !=Z_EROFS_LCLUSTER_TYPE_NONHEAD) {
+ /* m.lcn should be >= 1 if endoff < m.clusterofs */ + if (!m.lcn) {
+erofs_err(sb, "invalid logical cluster 0 at nid %llu", + vi->nid);
+ err =-EFSCORRUPTED;
+ gotounmap_out;
+ }
+ end = (m.lcn << lclusterbits) | m.clusterofs;
+map->m_flags|=EROFS_MAP_FULL_MAPPED;
+ m.delta[0] = 1;
}
- /* m.lcn should be >= 1 if endoff < m.clusterofs */
- if (!m.lcn) {
-erofs_err(sb, "invalid logical cluster 0 at nid %llu", - vi->nid);
- err =-EFSCORRUPTED;
+ /* get the corresponding first chunk */
+ err =z_erofs_extent_lookback(&m, m.delta[0]);
+ if (err)
gotounmap_out;
- }
- end = (m.lcn << lclusterbits) | m.clusterofs;
-map->m_flags|=EROFS_MAP_FULL_MAPPED;
- m.delta[0] = 1;
}fs/erofs/zmap.c +0
-6- - /* get the corresponding first chunk */ - err = z_erofs_extent_lookback(&m, m.delta[0]); - if (err) - goto unmap_out; -map_block:if (m.partialref)
map->m_flags|=EROFS_MAP_PARTIAL_REF;
map->m_llen= end -map->m_la;