erofs: keep meta inode into erofs_buf

So that erofs_read_metadata() can read metadata from other inodes
(e.g. packed inode) as well.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
Acked-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230407141710.113882-2-jefflexu@linux.alibaba.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 03c6ffdfcbfbce9ea7db06976ef7debf5b9be5dd..6fe9a779fa91643430ede2c84a4a7c1ff4899f66 100644 (file)
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -31,11 +31,11 @@ void erofs_put_metabuf(struct erofs_buf *buf)
  * Derive the block size from inode->i_blkbits to make compatible with
  * anonymous inode in fscache mode.
  */
-void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
-                 erofs_blk_t blkaddr, enum erofs_kmap_type type)
+void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
+                 enum erofs_kmap_type type)
 {
+       struct inode *inode = buf->inode;
        erofs_off_t offset = (erofs_off_t)blkaddr << inode->i_blkbits;
-       struct address_space *const mapping = inode->i_mapping;
        pgoff_t index = offset >> PAGE_SHIFT;
        struct page *page = buf->page;
        struct folio *folio;
@@ -45,7 +45,7 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
                erofs_put_metabuf(buf);
 
                nofs_flag = memalloc_nofs_save();
-               folio = read_cache_folio(mapping, index, NULL, NULL);
+               folio = read_cache_folio(inode->i_mapping, index, NULL, NULL);
                memalloc_nofs_restore(nofs_flag);
                if (IS_ERR(folio))
                        return folio;
@@ -67,14 +67,19 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
        return buf->base + (offset & ~PAGE_MASK);
 }
 
-void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
-                        erofs_blk_t blkaddr, enum erofs_kmap_type type)
+void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)
 {
        if (erofs_is_fscache_mode(sb))
-               return erofs_bread(buf, EROFS_SB(sb)->s_fscache->inode,
-                                  blkaddr, type);
+               buf->inode = EROFS_SB(sb)->s_fscache->inode;
+       else
+               buf->inode = sb->s_bdev->bd_inode;
+}
 
-       return erofs_bread(buf, sb->s_bdev->bd_inode, blkaddr, type);
+void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
+                        erofs_blk_t blkaddr, enum erofs_kmap_type type)
+{
+       erofs_init_metabuf(buf, sb);
+       return erofs_bread(buf, blkaddr, type);
 }
 
 static int erofs_map_blocks_flatmode(struct inode *inode,

diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c
index 963bbed0b699492a08554ee8d7f4a4951bac2e91..b80abec0531aadc10d0e0ba9a6a4db94d81061d5 100644 (file)
--- a/fs/erofs/dir.c
+++ b/fs/erofs/dir.c
@@ -58,11 +58,12 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
        int err = 0;
        bool initial = true;
 
+       buf.inode = dir;
        while (ctx->pos < dirsize) {
                struct erofs_dirent *de;
                unsigned int nameoff, maxsize;
 
-               de = erofs_bread(&buf, dir, i, EROFS_KMAP);
+               de = erofs_bread(&buf, i, EROFS_KMAP);
                if (IS_ERR(de)) {
                        erofs_err(sb, "fail to readdir of logical block %u of nid %llu",
                                  i, EROFS_I(dir)->nid);

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 1581ad78ee6512aa20590c645c0d55adcb39cbfb..caea9dc1cd8245c43621ce55cd64c3f1c9fff0ab 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -248,6 +248,7 @@ enum erofs_kmap_type {
 };
 
 struct erofs_buf {
+       struct inode *inode;
        struct page *page;
        void *base;
        enum erofs_kmap_type kmap_type;
@@ -441,8 +442,9 @@ extern const struct iomap_ops z_erofs_iomap_report_ops;
 
 void erofs_unmap_metabuf(struct erofs_buf *buf);
 void erofs_put_metabuf(struct erofs_buf *buf);
-void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
-                 erofs_blk_t blkaddr, enum erofs_kmap_type type);
+void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
+                 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);
 int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);

diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c
index f091e9a0f0a1c48e226cc13e4c9f7a46b8bded86..43096bac4c99d4f56268695f2d49b026fec084f2 100644 (file)
--- a/fs/erofs/namei.c
+++ b/fs/erofs/namei.c
@@ -99,7 +99,8 @@ static void *erofs_find_target_block(struct erofs_buf *target,
                struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
                struct erofs_dirent *de;
 
-               de = erofs_bread(&buf, dir, mid, EROFS_KMAP);
+               buf.inode = dir;
+               de = erofs_bread(&buf, mid, EROFS_KMAP);
                if (!IS_ERR(de)) {
                        const int nameoff = nameoff_from_disk(de->nameoff, bsz);
                        const int ndirents = nameoff / sizeof(*de);
@@ -170,6 +171,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid,
 
        qn.name = name->name;
        qn.end = name->name + name->len;
+       buf.inode = dir;
 
        ndirents = 0;
        de = erofs_find_target_block(&buf, dir, &qn, &ndirents);

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 5475ff2f732774133fc06e2b0694fa123fe5ddd8..f45a15ee2311c536f8b4a8d3fa14dec9037faeab 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -135,7 +135,7 @@ static void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
        int len, i, cnt;
 
        *offset = round_up(*offset, 4);
-       ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset), EROFS_KMAP);
+       ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);
        if (IS_ERR(ptr))
                return ptr;
 
@@ -151,8 +151,7 @@ static void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
        for (i = 0; i < len; i += cnt) {
                cnt = min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset),
                            len - i);
-               ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset),
-                                        EROFS_KMAP);
+               ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);
                if (IS_ERR(ptr)) {
                        kfree(buffer);
                        return ptr;
@@ -179,6 +178,7 @@ static int erofs_load_compr_cfgs(struct super_block *sb,
                return -EINVAL;
        }
 
+       erofs_init_metabuf(&buf, sb);
        offset = EROFS_SUPER_OFFSET + sbi->sb_size;
        alg = 0;
        for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index a90d37c7bdd7feb2803e6b60c78b877989714332..34944e400037e23043950046e0386408972e0c24 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -939,12 +939,12 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,
        if (!packed_inode)
                return -EFSCORRUPTED;
 
+       buf.inode = packed_inode;
        pos += EROFS_I(inode)->z_fragmentoff;
        for (i = 0; i < len; i += cnt) {
                cnt = min_t(unsigned int, len - i,
                            sb->s_blocksize - erofs_blkoff(sb, pos));
-               src = erofs_bread(&buf, packed_inode,
-                                 erofs_blknr(sb, pos), EROFS_KMAP);
+               src = erofs_bread(&buf, erofs_blknr(sb, pos), EROFS_KMAP);
                if (IS_ERR(src)) {
                        erofs_put_metabuf(&buf);
                        return PTR_ERR(src);