From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754101AbcHYJ11 (ORCPT ); Thu, 25 Aug 2016 05:27:27 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:7210 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751000AbcHYJ10 (ORCPT ); Thu, 25 Aug 2016 05:27:26 -0400 Subject: Re: [PATCH 1/2] f2fs: fix to preallocate block only aligned to 4K To: Jaegeuk Kim References: <20160820071202.31355-1-yuchao0@huawei.com> <20160823231909.GA77787@jaegeuk> CC: , From: Chao Yu Message-ID: <3dca4862-5722-154c-301d-7bf81a18e8ea@huawei.com> Date: Thu, 25 Aug 2016 17:24:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <20160823231909.GA77787@jaegeuk> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.134.22.195] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090205.57BEB961.0092,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 1f525def7f35eba96193ea5ccc34ce12 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chao Yu Subject: Re: [PATCH 1/2] f2fs: fix to preallocate block only aligned to 4K Date: Thu, 25 Aug 2016 17:24:42 +0800 Message-ID: <3dca4862-5722-154c-301d-7bf81a18e8ea@huawei.com> References: <20160820071202.31355-1-yuchao0@huawei.com> <20160823231909.GA77787@jaegeuk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1bcqvX-0005Kw-1m for linux-f2fs-devel@lists.sourceforge.net; Thu, 25 Aug 2016 09:26:23 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1bcqvR-0002TQ-KF for linux-f2fs-devel@lists.sourceforge.net; Thu, 25 Aug 2016 09:26:23 +0000 In-Reply-To: <20160823231909.GA77787@jaegeuk> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: Jaegeuk Kim Cc: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net 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; > > ------------------------------------------------------------------------------