TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: f2fs: don't mix to use union values in extent_info

Browse Source 
Let's explicitly use the defined values in block_age case only.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit ed2724765e58e3310d3de48f4a1761631b3dd640)
Change-Id: Ibbed9907e98c54a7fc807f5deb9300aeb2d35e70
Signed-off-by: zhaoyuenan <amktiao030215@gmail.com>
This commit is contained in:
Jaegeuk Kim
2022-12-16 14:41:54 -08:00
committed by Bruno Martins
parent ef24b96cf6
commit bfef390e6c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/f2fs/extent_cache.c
View File

@@ -882,7 +882,8 @@ static unsigned long long __calculate_block_age(unsigned long long new,
} }
/* This returns a new age and allocated blocks in ei */ /* This returns a new age and allocated blocks in ei */
static int __get_new_block_age(struct inode *inode, struct extent_info *ei) static int __get_new_block_age(struct inode *inode, struct extent_info *ei,
block_t blkaddr)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
loff_t f_size = i_size_read(inode); loff_t f_size = i_size_read(inode);
@@ -895,7 +896,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei)
* block here. * block here.
*/ */
if ((f_size >> PAGE_SHIFT) == ei->fofs && f_size & (PAGE_SIZE - 1) && if ((f_size >> PAGE_SHIFT) == ei->fofs && f_size & (PAGE_SIZE - 1) &&
ei->blk == NEW_ADDR) blkaddr == NEW_ADDR)
return -EINVAL; return -EINVAL;
if (__lookup_extent_tree(inode, ei->fofs, ei, EX_BLOCK_AGE)) { if (__lookup_extent_tree(inode, ei->fofs, ei, EX_BLOCK_AGE)) {
@@ -916,14 +917,14 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei)
return 0; return 0;
} }
f2fs_bug_on(sbi, ei->blk == NULL_ADDR); f2fs_bug_on(sbi, blkaddr == NULL_ADDR);
/* the data block was allocated for the first time */ /* the data block was allocated for the first time */
if (ei->blk == NEW_ADDR) if (blkaddr == NEW_ADDR)
goto out; goto out;
if (__is_valid_data_blkaddr(ei->blk) && if (__is_valid_data_blkaddr(blkaddr) &&
!f2fs_is_valid_blkaddr(sbi, ei->blk, DATA_GENERIC_ENHANCE)) { !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) {
f2fs_bug_on(sbi, 1); f2fs_bug_on(sbi, 1);
return -EINVAL; return -EINVAL;
} }
@@ -954,8 +955,7 @@ static void __update_extent_cache(struct dnode_of_data *dn, enum extent_type typ
else else
ei.blk = dn->data_blkaddr; ei.blk = dn->data_blkaddr;
} else if (type == EX_BLOCK_AGE) { } else if (type == EX_BLOCK_AGE) {
ei.blk = dn->data_blkaddr; if (__get_new_block_age(dn->inode, &ei, dn->data_blkaddr))
if (__get_new_block_age(dn->inode, &ei))
return; return;
} }
__update_extent_tree_range(dn->inode, &ei, type); __update_extent_tree_range(dn->inode, &ei, type);