redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

erofs: avoid using generic_block_bmap 

[ Upstream commit d8b3df8b10 ]

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>
5.4-rM2-2.2.x-imx-squashed
Huang Jianan 2020-12-09 19:57:40 +08:00 committed by Greg Kroah-Hartman
parent 35e2bec964
commit 6daf2d4663
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/erofs/data.c
View File

@ -323,27 +323,12 @@ static int erofs_raw_access_readpages(struct file *filp,
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)
{
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) {
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 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 */