Re: [PATCH] f2fs: fix the fault of calculating blkstart twice

[Jaegeuk Kim <jaegeuk@kernel.org>]

On 03/08, Kinglong Mee wrote:
> On 3/8/2017 09:11, Jaegeuk Kim wrote:
> > Hi,
> > 
> > On 03/04, Kinglong Mee wrote:
> >> When the zone type is BLK_ZONE_TYPE_CONVENTIONAL, the blkstart is 
> >> calculated twice.
> >>
> >> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
> >> ---
> >>  fs/f2fs/segment.c | 22 +++++++++-------------
> >>  1 file changed, 9 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> >> index 4bd7a8b..ed181d1 100644
> >> --- a/fs/f2fs/segment.c
> >> +++ b/fs/f2fs/segment.c
> >> @@ -772,11 +772,6 @@ static int __f2fs_issue_discard_async(struct f2fs_sb_info *sbi,
> >>  
> >>  	trace_f2fs_issue_discard(bdev, blkstart, blklen);
> >>  
> >> -	if (sbi->s_ndevs) {
> >> -		int devi = f2fs_target_device_index(sbi, blkstart);
> >> -
> >> -		blkstart -= FDEV(devi).start_blk;
> >> -	}
> > 
> > No, you can't do this, since the blkstart will be used for dc->lstart.
> > So, it needs to do like this?
> 
> Sorry, I miss that.
> 
> But, get_blkz_type() needs the new blkaddr for blkz_type as
> "FDEV(i).blkz_type[zno]", so that, the blkaddr must be calculated
> in front of __f2fs_issue_discard_zone, just like this?

Alright~
Added this. ;)

Thanks,

> 
> >From efd182428830898cc31d49f74d4bd2ab7455cec4 Mon Sep 17 00:00:00 2001
> From: Kinglong Mee <kinglongmee@gmail.com>
> Date: Wed, 8 Mar 2017 09:49:53 +0800
> Subject: [PATCH] f2fs: fix the fault of calculating blkstart twice
> 
> When the zone type is BLK_ZONE_TYPE_CONVENTIONAL, the blkstart is
> calculated twice.
> 
> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
>  fs/f2fs/segment.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 401f25d..dbd2e7a 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -816,6 +816,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
>  		struct block_device *bdev, block_t blkstart, block_t blklen)
>  {
>  	sector_t sector, nr_sects;
> +	block_t lblkstart = blkstart;
>  	int devi = 0;
>  
>  	if (sbi->s_ndevs) {
> @@ -833,7 +834,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi,
>  	case BLK_ZONE_TYPE_CONVENTIONAL:
>  		if (!blk_queue_discard(bdev_get_queue(bdev)))
>  			return 0;
> -		return __f2fs_issue_discard_async(sbi, bdev, blkstart, blklen);
> +		return __f2fs_issue_discard_async(sbi, bdev, lblkstart, blklen);
>  	case BLK_ZONE_TYPE_SEQWRITE_REQ:
>  	case BLK_ZONE_TYPE_SEQWRITE_PREF:
>  		sector = SECTOR_FROM_BLOCK(blkstart);
> -- 
> 2.9.3
> 

------------------------------------------------------------------------------
Announcing the Oxford Dictionaries API! The API offers world-renowned
dictionary content that is easy and intuitive to access. Sign up for an
account today to start using our lexical data to power your apps and
projects. Get started today and enter our developer competition.
http://sdm.link/oxford