diff options
| author | Gao Xiang <hsiangkao@linux.alibaba.com> | 2025-09-24 11:28:26 +0800 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@linux.alibaba.com> | 2025-09-25 11:26:39 +0800 |
| commit | e2d3af0d64e5fe2ee269e8f082642f82bcca3903 (patch) | |
| tree | a2bf097da5fb71ec5fe112374624ca417e6be130 | |
| parent | 1cf12c7177410afcb53f815315d1247ea57fae4f (diff) | |
| download | linux-e2d3af0d64e5fe2ee269e8f082642f82bcca3903.tar.gz linux-e2d3af0d64e5fe2ee269e8f082642f82bcca3903.zip | |
erofs: drop redundant sanity check for ztailpacking inline
It is already performed in z_erofs_map_blocks_fo().
Also align the error message with that used for the uncompressed
inline layout.
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
| -rw-r--r-- | fs/erofs/zdata.c | 3 | ||||
| -rw-r--r-- | fs/erofs/zmap.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 625b8ae8f67f..bc80cfe482f7 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -823,9 +823,6 @@ static int z_erofs_pcluster_begin(struct z_erofs_frontend *fe) } rcu_read_unlock(); } - } else if ((map->m_pa & ~PAGE_MASK) + map->m_plen > PAGE_SIZE) { - DBG_BUGON(1); - return -EFSCORRUPTED; } if (pcl) { diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index 798223e6da9c..e5581dbeb4c2 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -462,8 +462,8 @@ static int z_erofs_map_blocks_fo(struct inode *inode, map->m_pa = vi->z_fragmentoff; map->m_plen = vi->z_idata_size; if (erofs_blkoff(sb, map->m_pa) + map->m_plen > sb->s_blocksize) { - erofs_err(sb, "invalid tail-packing pclustersize %llu", - map->m_plen); + erofs_err(sb, "ztailpacking inline data across blocks @ nid %llu", + vi->nid); err = -EFSCORRUPTED; goto unmap_out; } |