From nobody Wed Apr 15 10:03:07 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 A7520C43334 for ; Fri, 22 Jul 2022 08:27:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231487AbiGVI1j (ORCPT ); Fri, 22 Jul 2022 04:27:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234984AbiGVI1i (ORCPT ); Fri, 22 Jul 2022 04:27:38 -0400 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87CFD9E7BD for ; Fri, 22 Jul 2022 01:27:35 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R841e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0VK4RflD_1658478452; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VK4RflD_1658478452) by smtp.aliyun-inc.com; Fri, 22 Jul 2022 16:27:32 +0800 From: Jeffle Xu To: xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v4] erofs: update ctx->pos for every emitted dirent Date: Fri, 22 Jul 2022 16:27:32 +0800 Message-Id: <20220722082732.30935-1-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 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: Hongnan Li erofs_readdir update ctx->pos after filling a batch of dentries and it may cause dir/files duplication for NFS readdirplus which depends on ctx->pos to fill dir correctly. So update ctx->pos for every emitted dirent in erofs_fill_dentries to fix it. Also fix the update of ctx->pos when the initial file position has exceeded nameoff. Fixes: 3e917cc305c6 ("erofs: make filesystem exportable") Signed-off-by: Hongnan Li Signed-off-by: Jeffle Xu Reviewed-by: Chao Yu Reviewed-by: Gao Xiang --- fs/erofs/dir.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c index 18e59821c597..47c85f1b80d8 100644 --- a/fs/erofs/dir.c +++ b/fs/erofs/dir.c @@ -22,10 +22,9 @@ static void debug_one_dentry(unsigned char d_type, const= char *de_name, } =20 static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx, - void *dentry_blk, unsigned int *ofs, + void *dentry_blk, struct erofs_dirent *de, unsigned int nameoff, unsigned int maxsize) { - struct erofs_dirent *de =3D dentry_blk + *ofs; const struct erofs_dirent *end =3D dentry_blk + nameoff; =20 while (de < end) { @@ -59,9 +58,8 @@ static int erofs_fill_dentries(struct inode *dir, struct = dir_context *ctx, /* stopped by some reason */ return 1; ++de; - *ofs +=3D sizeof(struct erofs_dirent); + ctx->pos +=3D sizeof(struct erofs_dirent); } - *ofs =3D maxsize; return 0; } =20 @@ -95,7 +93,7 @@ static int erofs_readdir(struct file *f, struct dir_conte= xt *ctx) "invalid de[0].nameoff %u @ nid %llu", nameoff, EROFS_I(dir)->nid); err =3D -EFSCORRUPTED; - goto skip_this; + break; } =20 maxsize =3D min_t(unsigned int, @@ -106,17 +104,17 @@ static int erofs_readdir(struct file *f, struct dir_c= ontext *ctx) initial =3D false; =20 ofs =3D roundup(ofs, sizeof(struct erofs_dirent)); + ctx->pos =3D blknr_to_addr(i) + ofs; if (ofs >=3D nameoff) goto skip_this; } =20 - err =3D erofs_fill_dentries(dir, ctx, de, &ofs, + err =3D erofs_fill_dentries(dir, ctx, de, (void *)de + ofs, nameoff, maxsize); -skip_this: - ctx->pos =3D blknr_to_addr(i) + ofs; - if (err) break; +skip_this: + ctx->pos =3D blknr_to_addr(i) + maxsize; ++i; ofs =3D 0; } --=20 2.27.0