From mboxrd@z Thu Jan 1 00:00:00 1970 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 B51E5C433F5 for ; Sat, 28 May 2022 12:56:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235826AbiE1M4e (ORCPT ); Sat, 28 May 2022 08:56:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235715AbiE1M4c (ORCPT ); Sat, 28 May 2022 08:56:32 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEA081136 for ; Sat, 28 May 2022 05:56:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 34027B826FB for ; Sat, 28 May 2022 12:56:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A74A0C34100; Sat, 28 May 2022 12:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653742584; bh=J7E0lVyIo+juV6HoBpjS0XC2CTEDG/qqYQnsEbI+6KM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OAXCeLmS0ELKIjWVPGhirgLBRU3x4frBF+lzSaeOqheE6zEQCAHO7boLdjdFQk700 s4v0CgbBnQfstpnz2kcfzQcPDfTSsmF4zfiiUoB2Rq4nZbIEftL1uJrqqQeWaI4gR6 MOaN39L1zpApUUXLgQ3G/IFF0RGXvPqCk613v8NsVeHH8VQpxVZ3WqempZOxNWE0Hp z2xlNlJdsjte1PEHHlpYrLj5FkLUSMs+bw6xcVzl83WpsoBx/+Hb6B6aH/aoLl3UNz 7RUQzsCVXA8Vbv539D8qdBcG0QucPIclZEtfa2wgiO0jvrHk2NlZXWrlC03zX62WG8 q/kHXkS0/f1Jw== Date: Sat, 28 May 2022 20:56:17 +0800 From: Gao Xiang To: Hongnan Li Cc: linux-erofs@lists.ozlabs.org, xiang@kernel.org, chao@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] erofs: update ctx->pos for every emitted dirent Message-ID: Mail-Followup-To: Hongnan Li , linux-erofs@lists.ozlabs.org, xiang@kernel.org, chao@kernel.org, linux-kernel@vger.kernel.org References: <20220527072536.68516-1-hongnan.li@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220527072536.68516-1-hongnan.li@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Hongnan, On Fri, May 27, 2022 at 03:25:36PM +0800, Hongnan Li wrote: > 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. > > Fixes: 3e917cc305c6 ("erofs: make filesystem exportable") > Signed-off-by: Hongnan Li > --- > fs/erofs/dir.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c > index 18e59821c597..3015974fe2ff 100644 > --- a/fs/erofs/dir.c > +++ b/fs/erofs/dir.c > @@ -22,11 +22,12 @@ static void debug_one_dentry(unsigned char d_type, const char *de_name, > } > > static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx, > - void *dentry_blk, unsigned int *ofs, > + void *dentry_blk, void *dentry_begin, > unsigned int nameoff, unsigned int maxsize) > { > - struct erofs_dirent *de = dentry_blk + *ofs; > + struct erofs_dirent *de = dentry_begin; > const struct erofs_dirent *end = dentry_blk + nameoff; > + loff_t begin_pos = ctx->pos; > > while (de < end) { > const char *de_name; > @@ -59,9 +60,9 @@ static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx, > /* stopped by some reason */ > return 1; > ++de; > - *ofs += sizeof(struct erofs_dirent); > + ctx->pos += sizeof(struct erofs_dirent); > } > - *ofs = maxsize; > + ctx->pos = begin_pos + maxsize; > return 0; > } > > @@ -110,11 +111,9 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx) > goto skip_this; > } > > - err = erofs_fill_dentries(dir, ctx, de, &ofs, > + err = erofs_fill_dentries(dir, ctx, de, de + ofs, > nameoff, maxsize); This will break the calculation, since de is a pointer of erofs_dirent rather than byte-based. Thanks, Gao Xiang From mboxrd@z Thu Jan 1 00:00:00 1970 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 49710C433EF for ; Sat, 28 May 2022 12:56:37 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4L9MBC5NNDz3bsB for ; Sat, 28 May 2022 22:56:35 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=OAXCeLmS; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=2604:1380:4641:c500::1; helo=dfw.source.kernel.org; envelope-from=xiang@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=OAXCeLmS; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4L9MB44zXMz304F for ; Sat, 28 May 2022 22:56:28 +1000 (AEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4376560E88; Sat, 28 May 2022 12:56:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A74A0C34100; Sat, 28 May 2022 12:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653742584; bh=J7E0lVyIo+juV6HoBpjS0XC2CTEDG/qqYQnsEbI+6KM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OAXCeLmS0ELKIjWVPGhirgLBRU3x4frBF+lzSaeOqheE6zEQCAHO7boLdjdFQk700 s4v0CgbBnQfstpnz2kcfzQcPDfTSsmF4zfiiUoB2Rq4nZbIEftL1uJrqqQeWaI4gR6 MOaN39L1zpApUUXLgQ3G/IFF0RGXvPqCk613v8NsVeHH8VQpxVZ3WqempZOxNWE0Hp z2xlNlJdsjte1PEHHlpYrLj5FkLUSMs+bw6xcVzl83WpsoBx/+Hb6B6aH/aoLl3UNz 7RUQzsCVXA8Vbv539D8qdBcG0QucPIclZEtfa2wgiO0jvrHk2NlZXWrlC03zX62WG8 q/kHXkS0/f1Jw== Date: Sat, 28 May 2022 20:56:17 +0800 From: Gao Xiang To: Hongnan Li Subject: Re: [PATCH] erofs: update ctx->pos for every emitted dirent Message-ID: Mail-Followup-To: Hongnan Li , linux-erofs@lists.ozlabs.org, xiang@kernel.org, chao@kernel.org, linux-kernel@vger.kernel.org References: <20220527072536.68516-1-hongnan.li@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220527072536.68516-1-hongnan.li@linux.alibaba.com> 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: , Cc: linux-erofs@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: linux-erofs-bounces+linux-erofs=archiver.kernel.org@lists.ozlabs.org Sender: "Linux-erofs" Hi Hongnan, On Fri, May 27, 2022 at 03:25:36PM +0800, Hongnan Li wrote: > 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. > > Fixes: 3e917cc305c6 ("erofs: make filesystem exportable") > Signed-off-by: Hongnan Li > --- > fs/erofs/dir.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c > index 18e59821c597..3015974fe2ff 100644 > --- a/fs/erofs/dir.c > +++ b/fs/erofs/dir.c > @@ -22,11 +22,12 @@ static void debug_one_dentry(unsigned char d_type, const char *de_name, > } > > static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx, > - void *dentry_blk, unsigned int *ofs, > + void *dentry_blk, void *dentry_begin, > unsigned int nameoff, unsigned int maxsize) > { > - struct erofs_dirent *de = dentry_blk + *ofs; > + struct erofs_dirent *de = dentry_begin; > const struct erofs_dirent *end = dentry_blk + nameoff; > + loff_t begin_pos = ctx->pos; > > while (de < end) { > const char *de_name; > @@ -59,9 +60,9 @@ static int erofs_fill_dentries(struct inode *dir, struct dir_context *ctx, > /* stopped by some reason */ > return 1; > ++de; > - *ofs += sizeof(struct erofs_dirent); > + ctx->pos += sizeof(struct erofs_dirent); > } > - *ofs = maxsize; > + ctx->pos = begin_pos + maxsize; > return 0; > } > > @@ -110,11 +111,9 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx) > goto skip_this; > } > > - err = erofs_fill_dentries(dir, ctx, de, &ofs, > + err = erofs_fill_dentries(dir, ctx, de, de + ofs, > nameoff, maxsize); This will break the calculation, since de is a pointer of erofs_dirent rather than byte-based. Thanks, Gao Xiang