Commit e0981544 authored by Al Viro's avatar Al Viro Committed by Gao Xiang
Browse files

erofs: mechanically convert erofs_read_metabuf() to offsets 



just lift the call of erofs_pos() into the callers; it will
collapse in most of them, but that's better done caller-by-caller.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/20240425195846.GC1031757@ZenIV


Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
parent c34110e0

fs/erofs/data.c

+4 −4
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb) 
}



void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,

			 erofs_blk_t blkaddr, enum erofs_kmap_type type)

			 erofs_off_t offset, enum erofs_kmap_type type)

{

	erofs_init_metabuf(buf, sb);

	return erofs_bread(buf, erofs_pos(sb, blkaddr), type);

	return erofs_bread(buf, offset, type);

}



static int erofs_map_blocks_flatmode(struct inode *inode,
@@ -152,7 +152,7 @@ int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map) 
	pos = ALIGN(erofs_iloc(inode) + vi->inode_isize +

		    vi->xattr_isize, unit) + unit * chunknr;



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

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

	if (IS_ERR(kaddr)) {

		err = PTR_ERR(kaddr);

		goto out;
@@ -295,7 +295,7 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 


		iomap->type = IOMAP_INLINE;

		ptr = erofs_read_metabuf(&buf, sb,

				erofs_blknr(sb, mdev.m_pa), EROFS_KMAP);

				erofs_pos(sb, erofs_blknr(sb, mdev.m_pa)), EROFS_KMAP);

		if (IS_ERR(ptr))

			return PTR_ERR(ptr);

		iomap->inline_data = ptr + erofs_blkoff(sb, mdev.m_pa);

fs/erofs/fscache.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_rq *req) 
		blknr = erofs_blknr(sb, map.m_pa);

		size = map.m_llen;



		src = erofs_read_metabuf(&buf, sb, blknr, EROFS_KMAP);

		src = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blknr), EROFS_KMAP);

		if (IS_ERR(src))

			return PTR_ERR(src);

fs/erofs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static void *erofs_read_inode(struct erofs_buf *buf, 
	blkaddr = erofs_blknr(sb, inode_loc);

	*ofs = erofs_blkoff(sb, inode_loc);



	kaddr = erofs_read_metabuf(buf, sb, blkaddr, EROFS_KMAP);

	kaddr = erofs_read_metabuf(buf, sb, erofs_pos(sb, blkaddr), EROFS_KMAP);

	if (IS_ERR(kaddr)) {

		erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",

			  vi->nid, PTR_ERR(kaddr));
@@ -66,7 +66,7 @@ static void *erofs_read_inode(struct erofs_buf *buf, 
				goto err_out;

			}

			memcpy(copied, dic, gotten);

			kaddr = erofs_read_metabuf(buf, sb, blkaddr + 1,

			kaddr = erofs_read_metabuf(buf, sb, erofs_pos(sb, blkaddr + 1),

						   EROFS_KMAP);

			if (IS_ERR(kaddr)) {

				erofs_err(sb, "failed to get inode payload block (nid: %llu), err %ld",

fs/erofs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, 
		  enum erofs_kmap_type type);

void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb);

void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,

			 erofs_blk_t blkaddr, enum erofs_kmap_type type);

			 erofs_off_t offset, enum erofs_kmap_type type);

int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);

int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		 u64 start, u64 len);

fs/erofs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb, 
	struct file *bdev_file;

	void *ptr;



	ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *pos), EROFS_KMAP);

	ptr = erofs_read_metabuf(buf, sb, erofs_pos(sb, erofs_blknr(sb, *pos)), EROFS_KMAP);

	if (IS_ERR(ptr))

		return PTR_ERR(ptr);

	dis = ptr + erofs_blkoff(sb, *pos);