erofs: avoid using generic_block_bmap
[ Upstream commit5.4-rM2-2.2.x-imx-squashedd8b3df8b10
] Surprisingly, `block' in sector_t indicates the number of i_blkbits-sized blocks rather than sectors for bmap. In addition, considering buffer_head limits mapped size to 32-bits, should avoid using generic_block_bmap. Link: https://lore.kernel.org/r/20201209115740.18802-1-huangjianan@oppo.com Fixes:9da681e017
("staging: erofs: support bmap") Reviewed-by: Chao Yu <yuchao0@huawei.com> Reviewed-by: Gao Xiang <hsiangkao@redhat.com> Signed-off-by: Huang Jianan <huangjianan@oppo.com> Signed-off-by: Guo Weichao <guoweichao@oppo.com> [ Gao Xiang: slightly update the commit message description. ] Signed-off-by: Gao Xiang <hsiangkao@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
parent
35e2bec964
commit
6daf2d4663
|
@ -323,27 +323,12 @@ static int erofs_raw_access_readpages(struct file *filp,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int erofs_get_block(struct inode *inode, sector_t iblock,
|
|
||||||
struct buffer_head *bh, int create)
|
|
||||||
{
|
|
||||||
struct erofs_map_blocks map = {
|
|
||||||
.m_la = iblock << 9,
|
|
||||||
};
|
|
||||||
int err;
|
|
||||||
|
|
||||||
err = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW);
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
if (map.m_flags & EROFS_MAP_MAPPED)
|
|
||||||
bh->b_blocknr = erofs_blknr(map.m_pa);
|
|
||||||
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
static sector_t erofs_bmap(struct address_space *mapping, sector_t block)
|
static sector_t erofs_bmap(struct address_space *mapping, sector_t block)
|
||||||
{
|
{
|
||||||
struct inode *inode = mapping->host;
|
struct inode *inode = mapping->host;
|
||||||
|
struct erofs_map_blocks map = {
|
||||||
|
.m_la = blknr_to_addr(block),
|
||||||
|
};
|
||||||
|
|
||||||
if (EROFS_I(inode)->datalayout == EROFS_INODE_FLAT_INLINE) {
|
if (EROFS_I(inode)->datalayout == EROFS_INODE_FLAT_INLINE) {
|
||||||
erofs_blk_t blks = i_size_read(inode) >> LOG_BLOCK_SIZE;
|
erofs_blk_t blks = i_size_read(inode) >> LOG_BLOCK_SIZE;
|
||||||
|
@ -352,7 +337,10 @@ static sector_t erofs_bmap(struct address_space *mapping, sector_t block)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return generic_block_bmap(mapping, block, erofs_get_block);
|
if (!erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW))
|
||||||
|
return erofs_blknr(map.m_pa);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* for uncompressed (aligned) files and raw access for other files */
|
/* for uncompressed (aligned) files and raw access for other files */
|
||||||
|
|
Loading…
Reference in New Issue