From nobody Wed Feb 11 15:24:59 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F323BC77B6F for ; Fri, 7 Apr 2023 14:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240235AbjDGORZ (ORCPT ); Fri, 7 Apr 2023 10:17:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230082AbjDGORS (ORCPT ); Fri, 7 Apr 2023 10:17:18 -0400 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7D4A6EB5 for ; Fri, 7 Apr 2023 07:17:15 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R671e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045176;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VfX2QQC_1680877032; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VfX2QQC_1680877032) by smtp.aliyun-inc.com; Fri, 07 Apr 2023 22:17:12 +0800 From: Jingbo Xu To: xiang@kernel.org, chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 1/7] erofs: keep meta inode into erofs_buf Date: Fri, 7 Apr 2023 22:17:04 +0800 Message-Id: <20230407141710.113882-2-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230407141710.113882-1-jefflexu@linux.alibaba.com> References: <20230407141710.113882-1-jefflexu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Gao Xiang So that erofs_read_metadata() can read metadata from other inodes (e.g. packed inode) as well. Signed-off-by: Gao Xiang --- fs/erofs/data.c | 23 ++++++++++++++--------- fs/erofs/dir.c | 3 ++- fs/erofs/internal.h | 6 ++++-- fs/erofs/namei.c | 4 +++- fs/erofs/super.c | 6 +++--- fs/erofs/zdata.c | 4 ++-- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index e5458b4c3d0c..aa7f9e4f86fb 100644 --- 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 =3D buf->inode; erofs_off_t offset =3D blkaddr << inode->i_blkbits; - struct address_space *const mapping =3D inode->i_mapping; pgoff_t index =3D offset >> PAGE_SHIFT; struct page *page =3D buf->page; struct folio *folio; @@ -45,7 +45,7 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *in= ode, erofs_put_metabuf(buf); =20 nofs_flag =3D memalloc_nofs_save(); - folio =3D read_cache_folio(mapping, index, NULL, NULL); + folio =3D 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); } =20 -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 =3D EROFS_SB(sb)->s_fscache->inode; + else + buf->inode =3D sb->s_bdev->bd_inode; +} =20 - 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); } =20 static int erofs_map_blocks_flatmode(struct inode *inode, diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c index 963bbed0b699..b80abec0531a 100644 --- a/fs/erofs/dir.c +++ b/fs/erofs/dir.c @@ -58,11 +58,12 @@ static int erofs_readdir(struct file *f, struct dir_con= text *ctx) int err =3D 0; bool initial =3D true; =20 + buf.inode =3D dir; while (ctx->pos < dirsize) { struct erofs_dirent *de; unsigned int nameoff, maxsize; =20 - de =3D erofs_bread(&buf, dir, i, EROFS_KMAP); + de =3D 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 e30a4fd43ccb..2bcff3194e4a 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -247,6 +247,7 @@ enum erofs_kmap_type { }; =20 struct erofs_buf { + struct inode *inode; struct page *page; void *base; enum erofs_kmap_type kmap_type; @@ -440,8 +441,9 @@ extern const struct iomap_ops z_erofs_iomap_report_ops; =20 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 f091e9a0f0a1..43096bac4c99 100644 --- a/fs/erofs/namei.c +++ b/fs/erofs/namei.c @@ -99,7 +99,8 @@ static void *erofs_find_target_block(struct erofs_buf *ta= rget, struct erofs_buf buf =3D __EROFS_BUF_INITIALIZER; struct erofs_dirent *de; =20 - de =3D erofs_bread(&buf, dir, mid, EROFS_KMAP); + buf.inode =3D dir; + de =3D erofs_bread(&buf, mid, EROFS_KMAP); if (!IS_ERR(de)) { const int nameoff =3D nameoff_from_disk(de->nameoff, bsz); const int ndirents =3D nameoff / sizeof(*de); @@ -170,6 +171,7 @@ int erofs_namei(struct inode *dir, const struct qstr *n= ame, erofs_nid_t *nid, =20 qn.name =3D name->name; qn.end =3D name->name + name->len; + buf.inode =3D dir; =20 ndirents =3D 0; de =3D erofs_find_target_block(&buf, dir, &qn, &ndirents); diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 9e56a6fb2267..58ffbf410bfb 100644 --- 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; =20 *offset =3D round_up(*offset, 4); - ptr =3D erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset), EROFS_KMAP); + ptr =3D erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP); if (IS_ERR(ptr)) return ptr; =20 @@ -151,8 +151,7 @@ static void *erofs_read_metadata(struct super_block *sb= , struct erofs_buf *buf, for (i =3D 0; i < len; i +=3D cnt) { cnt =3D min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset), len - i); - ptr =3D erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset), - EROFS_KMAP); + ptr =3D 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; } =20 + erofs_init_metabuf(&buf, sb); offset =3D EROFS_SUPER_OFFSET + sbi->sb_size; alg =3D 0; for (algs =3D sbi->available_compr_algs; algs; algs >>=3D 1, ++alg) { diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index a90d37c7bdd7..34944e400037 100644 --- 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; =20 + buf.inode =3D packed_inode; pos +=3D EROFS_I(inode)->z_fragmentoff; for (i =3D 0; i < len; i +=3D cnt) { cnt =3D min_t(unsigned int, len - i, sb->s_blocksize - erofs_blkoff(sb, pos)); - src =3D erofs_bread(&buf, packed_inode, - erofs_blknr(sb, pos), EROFS_KMAP); + src =3D erofs_bread(&buf, erofs_blknr(sb, pos), EROFS_KMAP); if (IS_ERR(src)) { erofs_put_metabuf(&buf); return PTR_ERR(src); --=20 2.19.1.6.gb485710b