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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E19AEEB64DA for ; Tue, 18 Jul 2023 08:14:46 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4R4sF14G6Qz30NY for ; Tue, 18 Jul 2023 18:14:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.alibaba.com (client-ip=115.124.30.101; helo=out30-101.freemail.mail.aliyun.com; envelope-from=hsiangkao@linux.alibaba.com; receiver=lists.ozlabs.org) Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4R4sDs37MDz2ytr for ; Tue, 18 Jul 2023 18:14:35 +1000 (AEST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VngvBS0_1689668068; Received: from 30.27.127.23(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VngvBS0_1689668068) by smtp.aliyun-inc.com; Tue, 18 Jul 2023 16:14:30 +0800 Message-ID: <05053b3f-4c69-0829-d6ee-d8bf4bfc0f31@linux.alibaba.com> Date: Tue, 18 Jul 2023 16:14:27 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 1/4] erofs-utils: simplify iloc() To: Jingbo Xu , chao@kernel.org, huyue2@coolpad.com, linux-erofs@lists.ozlabs.org References: <20230718052101.124039-1-jefflexu@linux.alibaba.com> <20230718052101.124039-2-jefflexu@linux.alibaba.com> From: Gao Xiang In-Reply-To: <20230718052101.124039-2-jefflexu@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: linux-erofs@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development of Linux EROFS file system List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" On 2023/7/18 13:20, Jingbo Xu wrote: > Signed-off-by: Jingbo Xu Could you please keep in sync with the kernel commit b780d3fc6107464dcc43631a6208c43b6421f1e6. I mean, use the name "erofs_iloc()" instead. Thanks, Gao Xiang > --- > fsck/main.c | 2 +- > include/erofs/internal.h | 10 +++++----- > lib/data.c | 4 ++-- > lib/namei.c | 2 +- > lib/xattr.c | 8 ++++---- > lib/zmap.c | 6 +++--- > 6 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/fsck/main.c b/fsck/main.c > index 608635e..498c646 100644 > --- a/fsck/main.c > +++ b/fsck/main.c > @@ -325,7 +325,7 @@ static int erofs_verify_xattr(struct erofs_inode *inode) > } > } > > - addr = iloc(inode->nid) + inode->inode_isize; > + addr = iloc(inode) + inode->inode_isize; > ret = dev_read(0, buf, addr, xattr_hdr_size); > if (ret < 0) { > erofs_err("failed to read xattr header @ nid %llu: %d", > diff --git a/include/erofs/internal.h b/include/erofs/internal.h > index 46690f5..23f64b7 100644 > --- a/include/erofs/internal.h > +++ b/include/erofs/internal.h > @@ -103,11 +103,6 @@ struct erofs_sb_info { > /* make sure that any user of the erofs headers has atleast 64bit off_t type */ > extern int erofs_assert_largefile[sizeof(off_t)-8]; > > -static inline erofs_off_t iloc(erofs_nid_t nid) > -{ > - return erofs_pos(sbi.meta_blkaddr) + (nid << sbi.islotbits); > -} > - > #define EROFS_FEATURE_FUNCS(name, compat, feature) \ > static inline bool erofs_sb_has_##name(void) \ > { \ > @@ -219,6 +214,11 @@ struct erofs_inode { > unsigned int fragment_size; > }; > > +static inline erofs_off_t iloc(struct erofs_inode *inode) > +{ > + return erofs_pos(sbi.meta_blkaddr) + (inode->nid << sbi.islotbits); > +} > + > static inline bool is_inode_layout_compression(struct erofs_inode *inode) > { > return erofs_inode_is_data_compressed(inode->datalayout); > diff --git a/lib/data.c b/lib/data.c > index 612112a..cc8ff2b 100644 > --- a/lib/data.c > +++ b/lib/data.c > @@ -33,7 +33,7 @@ static int erofs_map_blocks_flatmode(struct erofs_inode *inode, > map->m_plen = erofs_pos(lastblk) - offset; > } else if (tailendpacking) { > /* 2 - inode inline B: inode, [xattrs], inline last blk... */ > - map->m_pa = iloc(vi->nid) + vi->inode_isize + > + map->m_pa = iloc(vi) + vi->inode_isize + > vi->xattr_isize + erofs_blkoff(map->m_la); > map->m_plen = inode->i_size - offset; > > @@ -89,7 +89,7 @@ int erofs_map_blocks(struct erofs_inode *inode, > unit = EROFS_BLOCK_MAP_ENTRY_SIZE; /* block map */ > > chunknr = map->m_la >> vi->u.chunkbits; > - pos = roundup(iloc(vi->nid) + vi->inode_isize + > + pos = roundup(iloc(vi) + vi->inode_isize + > vi->xattr_isize, unit) + unit * chunknr; > > err = blk_read(0, buf, erofs_blknr(pos), 1); > diff --git a/lib/namei.c b/lib/namei.c > index 3751741..4b7e3e4 100644 > --- a/lib/namei.c > +++ b/lib/namei.c > @@ -28,7 +28,7 @@ int erofs_read_inode_from_disk(struct erofs_inode *vi) > char buf[sizeof(struct erofs_inode_extended)]; > struct erofs_inode_compact *dic; > struct erofs_inode_extended *die; > - const erofs_off_t inode_loc = iloc(vi->nid); > + const erofs_off_t inode_loc = iloc(vi); > > ret = dev_read(0, buf, inode_loc, sizeof(*dic)); > if (ret < 0) > diff --git a/lib/xattr.c b/lib/xattr.c > index 87a95c7..5ad2d25 100644 > --- a/lib/xattr.c > +++ b/lib/xattr.c > @@ -871,8 +871,8 @@ static int init_inode_xattrs(struct erofs_inode *vi) > return -ENOATTR; > } > > - it.blkaddr = erofs_blknr(iloc(vi->nid) + vi->inode_isize); > - it.ofs = erofs_blkoff(iloc(vi->nid) + vi->inode_isize); > + it.blkaddr = erofs_blknr(iloc(vi) + vi->inode_isize); > + it.ofs = erofs_blkoff(iloc(vi) + vi->inode_isize); > > ret = blk_read(0, it.page, it.blkaddr, 1); > if (ret < 0) > @@ -962,8 +962,8 @@ static int inline_xattr_iter_pre(struct xattr_iter *it, > > inline_xattr_ofs = vi->inode_isize + xattr_header_sz; > > - it->blkaddr = erofs_blknr(iloc(vi->nid) + inline_xattr_ofs); > - it->ofs = erofs_blkoff(iloc(vi->nid) + inline_xattr_ofs); > + it->blkaddr = erofs_blknr(iloc(vi) + inline_xattr_ofs); > + it->ofs = erofs_blkoff(iloc(vi) + inline_xattr_ofs); > > ret = blk_read(0, it->page, it->blkaddr, 1); > if (ret < 0) > diff --git a/lib/zmap.c b/lib/zmap.c > index 209b5d7..b0ae88e 100644 > --- a/lib/zmap.c > +++ b/lib/zmap.c > @@ -39,7 +39,7 @@ static int z_erofs_fill_inode_lazy(struct erofs_inode *vi) > if (vi->flags & EROFS_I_Z_INITED) > return 0; > > - pos = round_up(iloc(vi->nid) + vi->inode_isize + vi->xattr_isize, 8); > + pos = round_up(iloc(vi) + vi->inode_isize + vi->xattr_isize, 8); > ret = dev_read(0, buf, pos, sizeof(buf)); > if (ret < 0) > return -EIO; > @@ -143,7 +143,7 @@ static int legacy_load_cluster_from_disk(struct z_erofs_maprecorder *m, > unsigned long lcn) > { > struct erofs_inode *const vi = m->inode; > - const erofs_off_t ibase = iloc(vi->nid); > + const erofs_off_t ibase = iloc(vi); > const erofs_off_t pos = Z_EROFS_FULL_INDEX_ALIGN(ibase + > vi->inode_isize + vi->xattr_isize) + > lcn * sizeof(struct z_erofs_lcluster_index); > @@ -342,7 +342,7 @@ static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m, > { > struct erofs_inode *const vi = m->inode; > const unsigned int lclusterbits = vi->z_logical_clusterbits; > - const erofs_off_t ebase = round_up(iloc(vi->nid) + vi->inode_isize + > + const erofs_off_t ebase = round_up(iloc(vi) + vi->inode_isize + > vi->xattr_isize, 8) + > sizeof(struct z_erofs_map_header); > const unsigned int totalidx = BLK_ROUND_UP(vi->i_size);