Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 27 Oct 2021 00:31:53 +0300
From:   Kari Argillander <kari.argillander@gmail.com>
To:     Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Cc:     ntfs3@lists.linux.dev, linux-kernel@vger.kernel.org,
        linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH 4/4] fs/ntfs3: Update valid size if -EIOCBQUEUED
Message-ID: <20211026213153.yvddqfglffaojbqm@kari-VirtualBox>
References: <25b9a1b5-7738-7b36-7ead-c8faa7cacc87@paragon-software.com>
 <600c92df-35e9-2686-52f3-5129ccf30e5e@paragon-software.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <600c92df-35e9-2686-52f3-5129ccf30e5e@paragon-software.com>
Precedence: bulk

On Mon, Oct 25, 2021 at 07:59:56PM +0300, Konstantin Komarov wrote:
> Update valid size if write is still in I/O queue.
> Fixes xfstest generic/240

generic/240		[21:23:16][   17.933690] run fstests generic/240 at 2021-10-26 21:23:16
 [21:23:18] 2s
Ran: generic/240
Passed all 1 tests

> Fixes: 82cae269cfa9 ("fs/ntfs3: Add initialization of super block")
> 
> Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
> ---
>  fs/ntfs3/inode.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
> index 859951d785cb..c211c64e6b17 100644
> --- a/fs/ntfs3/inode.c
> +++ b/fs/ntfs3/inode.c
> @@ -757,6 +757,7 @@ static ssize_t ntfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
>  	loff_t vbo = iocb->ki_pos;
>  	loff_t end;
>  	int wr = iov_iter_rw(iter) & WRITE;
> +	size_t iter_count = iov_iter_count(iter);
>  	loff_t valid;
>  	ssize_t ret;
>  
> @@ -770,10 +771,14 @@ static ssize_t ntfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
>  				 wr ? ntfs_get_block_direct_IO_W
>  				    : ntfs_get_block_direct_IO_R);
>  
> -	if (ret <= 0)
> +	if (ret > 0)
> +		end = vbo + ret;
> +	else if (wr && -EIOCBQUEUED == ret)

ret == -EIOCBQUEUED 

> +		end = vbo + iter_count;

Use iov_iter_count() instead of tmp var?

> +	else {

Take brackets off.

>  		goto out;
> +	}
>  
> -	end = vbo + ret;
>  	valid = ni->i_valid;
>  	if (wr) {
>  		if (end > valid && !S_ISBLK(inode->i_mode)) {
> -- 
> 2.33.0
> 
> 
>