diff options
| author | Gao Xiang <hsiangkao@linux.alibaba.com> | 2023-01-14 23:08:23 +0800 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@linux.alibaba.com> | 2023-02-15 08:11:24 +0800 |
| commit | b780d3fc6107464dcc43631a6208c43b6421f1e6 (patch) | |
| tree | 818dce585e72f63ab6d7e7306a1173eba4b0b103 /fs/erofs/data.c | |
| parent | e324eaa9790614577c93e819651e0a83963dac79 (diff) | |
| download | linux-stable-b780d3fc6107464dcc43631a6208c43b6421f1e6.tar.gz linux-stable-b780d3fc6107464dcc43631a6208c43b6421f1e6.tar.bz2 linux-stable-b780d3fc6107464dcc43631a6208c43b6421f1e6.zip | |
erofs: simplify iloc()
Actually we could pass in inodes directly to clean up all callers.
Also rename iloc() as erofs_iloc().
Link: https://lore.kernel.org/r/20230114150823.432069-1-xiang@kernel.org
Reviewed-by: Yue Hu <huyue2@coolpad.com>
Reviewed-by: Jingbo Xu <jefflexu@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Diffstat (limited to 'fs/erofs/data.c')
| -rw-r--r-- | fs/erofs/data.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/erofs/data.c b/fs/erofs/data.c index f57f921683d7..2713257ee718 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -91,11 +91,8 @@ static int erofs_map_blocks_flatmode(struct inode *inode, map->m_pa = blknr_to_addr(vi->raw_blkaddr) + map->m_la; map->m_plen = blknr_to_addr(lastblk) - offset; } else if (tailendpacking) { - /* 2 - inode inline B: inode, [xattrs], inline last blk... */ - struct erofs_sb_info *sbi = EROFS_SB(inode->i_sb); - - map->m_pa = iloc(sbi, vi->nid) + vi->inode_isize + - vi->xattr_isize + erofs_blkoff(map->m_la); + map->m_pa = erofs_iloc(inode) + vi->inode_isize + + vi->xattr_isize + erofs_blkoff(offset); map->m_plen = inode->i_size - offset; /* inline data should be located in the same meta block */ @@ -150,7 +147,7 @@ int erofs_map_blocks(struct inode *inode, unit = EROFS_BLOCK_MAP_ENTRY_SIZE; /* block map */ chunknr = map->m_la >> vi->chunkbits; - pos = ALIGN(iloc(EROFS_SB(sb), vi->nid) + vi->inode_isize + + pos = ALIGN(erofs_iloc(inode) + vi->inode_isize + vi->xattr_isize, unit) + unit * chunknr; kaddr = erofs_read_metabuf(&buf, sb, erofs_blknr(pos), EROFS_KMAP); |