Commit b780d3fc authored by Gao Xiang's avatar Gao Xiang
Browse files

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: default avatarYue Hu <huyue2@coolpad.com>
Reviewed-by: default avatarJingbo Xu <jefflexu@linux.alibaba.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent e324eaa9

fs/erofs/data.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

fs/erofs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ static void *erofs_read_inode(struct erofs_buf *buf, 
	struct super_block *sb = inode->i_sb;

	struct erofs_sb_info *sbi = EROFS_SB(sb);

	struct erofs_inode *vi = EROFS_I(inode);

	const erofs_off_t inode_loc = iloc(sbi, vi->nid);

	const erofs_off_t inode_loc = erofs_iloc(inode);



	erofs_blk_t blkaddr, nblks = 0;

	void *kaddr;

fs/erofs/internal.h

+9 −7
Original line number Diff line number Diff line
@@ -270,11 +270,6 @@ struct erofs_buf { 
#define erofs_blkoff(addr)      ((addr) % EROFS_BLKSIZ)

#define blknr_to_addr(nr)       ((erofs_off_t)(nr) * EROFS_BLKSIZ)



static inline erofs_off_t iloc(struct erofs_sb_info *sbi, erofs_nid_t nid)

{

	return blknr_to_addr(sbi->meta_blkaddr) + (nid << sbi->islotbits);

}



#define EROFS_FEATURE_FUNCS(name, compat, feature) \

static inline bool erofs_sb_has_##name(struct erofs_sb_info *sbi) \

{ \
@@ -339,8 +334,15 @@ struct erofs_inode { 
	struct inode vfs_inode;

};



#define EROFS_I(ptr)	\

	container_of(ptr, struct erofs_inode, vfs_inode)

#define EROFS_I(ptr)	container_of(ptr, struct erofs_inode, vfs_inode)



static inline erofs_off_t erofs_iloc(struct inode *inode)

{

	struct erofs_sb_info *sbi = EROFS_I_SB(inode);



	return blknr_to_addr(sbi->meta_blkaddr) +

		(EROFS_I(inode)->nid << sbi->islotbits);

}



static inline unsigned long erofs_inode_datablocks(struct inode *inode)

{

fs/erofs/xattr.c

+7 −13
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ static int init_inode_xattrs(struct inode *inode) 
	struct xattr_iter it;

	unsigned int i;

	struct erofs_xattr_ibody_header *ih;

	struct super_block *sb;

	struct erofs_sb_info *sbi;

	struct super_block *sb = inode->i_sb;

	int ret = 0;



	/* the most case is that xattrs of this inode are initialized. */
@@ -52,15 +51,14 @@ static int init_inode_xattrs(struct inode *inode) 
	 *    undefined right now (maybe use later with some new sb feature).

	 */

	if (vi->xattr_isize == sizeof(struct erofs_xattr_ibody_header)) {

		erofs_err(inode->i_sb,

		erofs_err(sb,

			  "xattr_isize %d of nid %llu is not supported yet",

			  vi->xattr_isize, vi->nid);

		ret = -EOPNOTSUPP;

		goto out_unlock;

	} else if (vi->xattr_isize < sizeof(struct erofs_xattr_ibody_header)) {

		if (vi->xattr_isize) {

			erofs_err(inode->i_sb,

				  "bogus xattr ibody @ nid %llu", vi->nid);

			erofs_err(sb, "bogus xattr ibody @ nid %llu", vi->nid);

			DBG_BUGON(1);

			ret = -EFSCORRUPTED;

			goto out_unlock;	/* xattr ondisk layout error */
@@ -69,11 +67,9 @@ static int init_inode_xattrs(struct inode *inode) 
		goto out_unlock;

	}



	sb = inode->i_sb;

	sbi = EROFS_SB(sb);

	it.buf = __EROFS_BUF_INITIALIZER;

	it.blkaddr = erofs_blknr(iloc(sbi, vi->nid) + vi->inode_isize);

	it.ofs = erofs_blkoff(iloc(sbi, vi->nid) + vi->inode_isize);

	it.blkaddr = erofs_blknr(erofs_iloc(inode) + vi->inode_isize);

	it.ofs = erofs_blkoff(erofs_iloc(inode) + vi->inode_isize);



	/* read in shared xattr array (non-atomic, see kmalloc below) */

	it.kaddr = erofs_read_metabuf(&it.buf, sb, it.blkaddr, EROFS_KMAP);
@@ -159,7 +155,6 @@ static int inline_xattr_iter_begin(struct xattr_iter *it, 
				   struct inode *inode)

{

	struct erofs_inode *const vi = EROFS_I(inode);

	struct erofs_sb_info *const sbi = EROFS_SB(inode->i_sb);

	unsigned int xattr_header_sz, inline_xattr_ofs;



	xattr_header_sz = inlinexattr_header_size(inode);
@@ -170,9 +165,8 @@ static int inline_xattr_iter_begin(struct xattr_iter *it, 


	inline_xattr_ofs = vi->inode_isize + xattr_header_sz;



	it->blkaddr = erofs_blknr(iloc(sbi, vi->nid) + inline_xattr_ofs);

	it->ofs = erofs_blkoff(iloc(sbi, vi->nid) + inline_xattr_ofs);



	it->blkaddr = erofs_blknr(erofs_iloc(inode) + inline_xattr_ofs);

	it->ofs = erofs_blkoff(erofs_iloc(inode) + inline_xattr_ofs);

	it->kaddr = erofs_read_metabuf(&it->buf, inode->i_sb, it->blkaddr,

				       EROFS_KMAP);

	if (IS_ERR(it->kaddr))

fs/erofs/zmap.c

+5 −8
Original line number Diff line number Diff line
@@ -55,8 +55,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode) 
	if (test_bit(EROFS_I_Z_INITED_BIT, &vi->flags))

		goto out_unlock;



	pos = ALIGN(iloc(EROFS_SB(sb), vi->nid) + vi->inode_isize +

		    vi->xattr_isize, 8);

	pos = ALIGN(erofs_iloc(inode) + vi->inode_isize + vi->xattr_isize, 8);

	kaddr = erofs_read_metabuf(&buf, sb, erofs_blknr(pos), EROFS_KMAP);

	if (IS_ERR(kaddr)) {

		err = PTR_ERR(kaddr);
@@ -169,10 +168,9 @@ static int legacy_load_cluster_from_disk(struct z_erofs_maprecorder *m, 
{

	struct inode *const inode = m->inode;

	struct erofs_inode *const vi = EROFS_I(inode);

	const erofs_off_t ibase = iloc(EROFS_I_SB(inode), vi->nid);

	const erofs_off_t pos =

		Z_EROFS_VLE_LEGACY_INDEX_ALIGN(ibase + vi->inode_isize +

					       vi->xattr_isize) +

		Z_EROFS_VLE_LEGACY_INDEX_ALIGN(erofs_iloc(inode) +

				vi->inode_isize + vi->xattr_isize) +

		lcn * sizeof(struct z_erofs_vle_decompressed_index);

	struct z_erofs_vle_decompressed_index *di;

	unsigned int advise, type;
@@ -372,9 +370,8 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, 
	struct inode *const inode = m->inode;

	struct erofs_inode *const vi = EROFS_I(inode);

	const unsigned int lclusterbits = vi->z_logical_clusterbits;

	const erofs_off_t ebase = ALIGN(iloc(EROFS_I_SB(inode), vi->nid) +

					vi->inode_isize + vi->xattr_isize, 8) +

		sizeof(struct z_erofs_map_header);

	const erofs_off_t ebase = sizeof(struct z_erofs_map_header) +

		ALIGN(erofs_iloc(inode) + vi->inode_isize + vi->xattr_isize, 8);

	const unsigned int totalidx = DIV_ROUND_UP(inode->i_size, EROFS_BLKSIZ);

	unsigned int compacted_4b_initial, compacted_2b;

	unsigned int amortizedshift;