UPSTREAM: f2fs: fix wrong calculation of block age
Currently we wrongly calculate the new block age to
old * LAST_AGE_WEIGHT / 100.
Fix it to new * (100 - LAST_AGE_WEIGHT) / 100
+ old * LAST_AGE_WEIGHT / 100.
Signed-off-by: qixiaoyu1 <qixiaoyu1@xiaomi.com>
Signed-off-by: xiongping1 <xiongping1@xiaomi.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit b03a41a495df35f8e8d25220878bd6b8472d9396)
Change-Id: I989877caf2517245750e7ed809b2af71f8943f96
Signed-off-by: zhaoyuenan <amktiao030215@gmail.com>
This commit is contained in:
@@ -874,11 +874,18 @@ void f2fs_update_read_extent_tree_range_compressed(struct inode *inode,
|
|||||||
static unsigned long long __calculate_block_age(unsigned long long new,
|
static unsigned long long __calculate_block_age(unsigned long long new,
|
||||||
unsigned long long old)
|
unsigned long long old)
|
||||||
{
|
{
|
||||||
unsigned long long diff;
|
unsigned int rem_old, rem_new;
|
||||||
|
unsigned long long res;
|
||||||
|
|
||||||
diff = (new >= old) ? new - (new - old) : new + (old - new);
|
res = div_u64_rem(new, 100, &rem_new) * (100 - LAST_AGE_WEIGHT)
|
||||||
|
+ div_u64_rem(old, 100, &rem_old) * LAST_AGE_WEIGHT;
|
||||||
|
|
||||||
return div_u64(diff * LAST_AGE_WEIGHT, 100);
|
if (rem_new)
|
||||||
|
res += rem_new * (100 - LAST_AGE_WEIGHT) / 100;
|
||||||
|
if (rem_old)
|
||||||
|
res += rem_old * LAST_AGE_WEIGHT / 100;
|
||||||
|
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This returns a new age and allocated blocks in ei */
|
/* This returns a new age and allocated blocks in ei */
|
||||||
|
|||||||
Reference in New Issue
Block a user