All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chao Yu <yuchao0@huawei.com>
To: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: <linux-f2fs-devel@lists.sourceforge.net>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] f2fs: fix to preallocate block only aligned to 4K
Date: Thu, 25 Aug 2016 17:24:42 +0800	[thread overview]
Message-ID: <3dca4862-5722-154c-301d-7bf81a18e8ea@huawei.com> (raw)
In-Reply-To: <20160823231909.GA77787@jaegeuk>

Hi Jaegeuk,

On 2016/8/24 7:19, Jaegeuk Kim wrote:
> Hi Chao,
> 
> There is a bug when ki_pos = 1024, and iov_iter_count(from) = 1024 in xfstests.
> Could you check the below patch to fix your one?

Oh, you're right, thanks for fixing it. :)

Thanks,

> 
> ---
>  fs/f2fs/data.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 37a59f7..7c8e219 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -626,8 +626,12 @@ ssize_t f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)
>  	ssize_t ret = 0;
>  
>  	map.m_lblk = F2FS_BLK_ALIGN(iocb->ki_pos);
> -	map.m_len = F2FS_BYTES_TO_BLK(iocb->ki_pos + iov_iter_count(from)) -
> -								map.m_lblk;
> +	map.m_len = F2FS_BYTES_TO_BLK(iocb->ki_pos + iov_iter_count(from));
> +	if (map.m_len > map.m_lblk)
> +		map.m_len -= map.m_lblk;
> +	else
> +		map.m_len = 0;
> +
>  	map.m_next_pgofs = NULL;
>  
>  	if (f2fs_encrypted_inode(inode))
> @@ -673,6 +677,9 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
>  	bool allocated = false;
>  	block_t blkaddr;
>  
> +	if (!maxblocks)
> +		return 0;
> +
>  	map->m_len = 0;
>  	map->m_flags = 0;
>  
> 

WARNING: multiple messages have this Message-ID (diff)
From: Chao Yu <yuchao0@huawei.com>
To: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net
Subject: Re: [PATCH 1/2] f2fs: fix to preallocate block only aligned to 4K
Date: Thu, 25 Aug 2016 17:24:42 +0800	[thread overview]
Message-ID: <3dca4862-5722-154c-301d-7bf81a18e8ea@huawei.com> (raw)
In-Reply-To: <20160823231909.GA77787@jaegeuk>

Hi Jaegeuk,

On 2016/8/24 7:19, Jaegeuk Kim wrote:
> Hi Chao,
> 
> There is a bug when ki_pos = 1024, and iov_iter_count(from) = 1024 in xfstests.
> Could you check the below patch to fix your one?

Oh, you're right, thanks for fixing it. :)

Thanks,

> 
> ---
>  fs/f2fs/data.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 37a59f7..7c8e219 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -626,8 +626,12 @@ ssize_t f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)
>  	ssize_t ret = 0;
>  
>  	map.m_lblk = F2FS_BLK_ALIGN(iocb->ki_pos);
> -	map.m_len = F2FS_BYTES_TO_BLK(iocb->ki_pos + iov_iter_count(from)) -
> -								map.m_lblk;
> +	map.m_len = F2FS_BYTES_TO_BLK(iocb->ki_pos + iov_iter_count(from));
> +	if (map.m_len > map.m_lblk)
> +		map.m_len -= map.m_lblk;
> +	else
> +		map.m_len = 0;
> +
>  	map.m_next_pgofs = NULL;
>  
>  	if (f2fs_encrypted_inode(inode))
> @@ -673,6 +677,9 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,
>  	bool allocated = false;
>  	block_t blkaddr;
>  
> +	if (!maxblocks)
> +		return 0;
> +
>  	map->m_len = 0;
>  	map->m_flags = 0;
>  
> 


------------------------------------------------------------------------------

  reply	other threads:[~2016-08-25  9:27 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-20  7:12 [PATCH 1/2] f2fs: fix to preallocate block only aligned to 4K Chao Yu
2016-08-20  7:12 ` Chao Yu
2016-08-20  7:12 ` [PATCH 2/2] f2fs: fix to do f2fs_balance_fs in f2fs_map_blocks correctly Chao Yu
2016-08-20  7:12   ` Chao Yu
2016-08-23 23:19 ` [PATCH 1/2] f2fs: fix to preallocate block only aligned to 4K Jaegeuk Kim
2016-08-25  9:24   ` Chao Yu [this message]
2016-08-25  9:24     ` Chao Yu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3dca4862-5722-154c-301d-7bf81a18e8ea@huawei.com \
    --to=yuchao0@huawei.com \
    --cc=jaegeuk@kernel.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.