[PATCH] f2fs: use cur_map instead of ckpt_map

[PATCH] f2fs: use cur_map instead of ckpt_map

[Yunlei He]

This patch use cur_map instead of ckpt_map for easy to
understand, no functional change.

Signed-off-by: Yunlei He <heyunlei@huawei.com>
---
 fs/f2fs/segment.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 5854cc4..f5d0499 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1559,7 +1559,7 @@ static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,
 
 	/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */
 	for (i = 0; i < entries; i++)
-		dmap[i] = force ? ~ckpt_map[i] & ~discard_map[i] :
+		dmap[i] = force ? ~cur_map[i] & ~discard_map[i] :
 				(cur_map[i] ^ ckpt_map[i]) & ckpt_map[i];
 
 	while (force || SM_I(sbi)->dcc_info->nr_discards <=
-- 
1.9.1


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Re: [PATCH] f2fs: use cur_map instead of ckpt_map

[Chao Yu]

On 2018/4/9 19:36, Yunlei He wrote:
> This patch use cur_map instead of ckpt_map for easy to
> understand, no functional change.

Actually, it does change the logic, but I think it can fix a issue..

In flush_sit_entries::add_discard_addrs path, cur_map and ckpt_map are
the same, but in exist_trim_candidates::add_discard_addrs, cur_map is
updated one, and newer than ckpt_map, so we need to use cur_map to check
whether there are discard candidates.

Can you change commit message as described above and resend the patch?

Thanks,

> 
> Signed-off-by: Yunlei He <heyunlei@huawei.com>
> ---
>  fs/f2fs/segment.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 5854cc4..f5d0499 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -1559,7 +1559,7 @@ static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,
>  
>  	/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */
>  	for (i = 0; i < entries; i++)
> -		dmap[i] = force ? ~ckpt_map[i] & ~discard_map[i] :
> +		dmap[i] = force ? ~cur_map[i] & ~discard_map[i] :
>  				(cur_map[i] ^ ckpt_map[i]) & ckpt_map[i];
>  
>  	while (force || SM_I(sbi)->dcc_info->nr_discards <=
> 


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Re: [PATCH] f2fs: use cur_map instead of ckpt_map

[heyunlei]

>-----Original Message-----
>From: Yuchao (T)
>Sent: Tuesday, April 10, 2018 10:45 AM
>To: heyunlei; jaegeuk@kernel.org; linux-f2fs-devel@lists.sourceforge.net
>Cc: Wangbintian; Zhangdianfang (Euler)
>Subject: Re: [f2fs-dev][PATCH] f2fs: use cur_map instead of ckpt_map
>
>On 2018/4/9 19:36, Yunlei He wrote:
>> This patch use cur_map instead of ckpt_map for easy to
>> understand, no functional change.
>
>Actually, it does change the logic, but I think it can fix a issue..
>
>In flush_sit_entries::add_discard_addrs path, cur_map and ckpt_map are
>the same, but in exist_trim_candidates::add_discard_addrs, cur_map is
>updated one, and newer than ckpt_map, so we need to use cur_map to check
>whether there are discard candidates.
>
>Can you change commit message as described above and resend the patch?

Okay, I'll do it. 

Thanks.
>
>Thanks,
>
>>
>> Signed-off-by: Yunlei He <heyunlei@huawei.com>
>> ---
>>  fs/f2fs/segment.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
>> index 5854cc4..f5d0499 100644
>> --- a/fs/f2fs/segment.c
>> +++ b/fs/f2fs/segment.c
>> @@ -1559,7 +1559,7 @@ static bool add_discard_addrs(struct f2fs_sb_info *sbi, struct cp_control *cpc,
>>
>>  	/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */
>>  	for (i = 0; i < entries; i++)
>> -		dmap[i] = force ? ~ckpt_map[i] & ~discard_map[i] :
>> +		dmap[i] = force ? ~cur_map[i] & ~discard_map[i] :
>>  				(cur_map[i] ^ ckpt_map[i]) & ckpt_map[i];
>>
>>  	while (force || SM_I(sbi)->dcc_info->nr_discards <=
>>


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot