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: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/20240425195846.GC1031757@ZenIV
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index e1a170e45c700101da6b7eafa3d9aea0335b462c..82a196e02b5caa5c10062b6513b773e11ae57708 100644 (file)
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -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);

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 62da538d91cbd47cea44f4d021096c6a3a654908..ac618b3484f12000825b800a6d5f81feeabf2b9f 100644 (file)
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -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);
 

diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index 0eb0e6f933c34b9b03eb69d3bc8d04e743596f43..5f6439a63af798512f325beb4d0af112c2b252eb 100644 (file)
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -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",

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index c5254dc1f9653f537f802121b9a61a2a27d36da8..0c1b44ac9524f8bcf5999761953ae11259ab308d 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -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);

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 3013bfb2e9edc4fab0ddafa7e714e264afe1eba2..95b05a9490a2dbc04795cea0f2002c567da1175b 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -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);

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 283c9c3a611dfd989a1a2f12ea4593bc9458e743..d417e189f1a0d42eed09040d69f29f0aed6a71a3 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -868,7 +868,7 @@ static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe)
        } else {
                void *mptr;
 
-               mptr = erofs_read_metabuf(&map->buf, sb, blknr, EROFS_NO_KMAP);
+               mptr = erofs_read_metabuf(&map->buf, sb, erofs_pos(sb, blknr), EROFS_NO_KMAP);
                if (IS_ERR(mptr)) {
                        ret = PTR_ERR(mptr);
                        erofs_err(sb, "failed to get inline data %d", ret);

diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c
index 0a2454d8bcc13f5d66b219498d4a3dbc78d1d1d8..222fc66366e00ef1f94f8e0cdeab7ce5583a12da 100644 (file)
--- a/fs/erofs/zmap.c
+++ b/fs/erofs/zmap.c
@@ -34,7 +34,7 @@ static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,
        unsigned int advise;
 
        m->kaddr = erofs_read_metabuf(&m->map->buf, inode->i_sb,
-                                     erofs_blknr(inode->i_sb, pos), EROFS_KMAP);
+                                     erofs_pos(inode->i_sb, erofs_blknr(inode->i_sb, pos)), EROFS_KMAP);
        if (IS_ERR(m->kaddr))
                return PTR_ERR(m->kaddr);
 
@@ -256,7 +256,7 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,
 out:
        pos += lcn * (1 << amortizedshift);
        m->kaddr = erofs_read_metabuf(&m->map->buf, inode->i_sb,
-                                     erofs_blknr(inode->i_sb, pos), EROFS_KMAP);
+                                     erofs_pos(inode->i_sb, erofs_blknr(inode->i_sb, pos)), EROFS_KMAP);
        if (IS_ERR(m->kaddr))
                return PTR_ERR(m->kaddr);
        return unpack_compacted_index(m, amortizedshift, pos, lookahead);
@@ -590,7 +590,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)
                goto out_unlock;
 
        pos = ALIGN(erofs_iloc(inode) + vi->inode_isize + vi->xattr_isize, 8);
-       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_unlock;