f2fs: introduce get_checkpoint_version for cleanup
There exists almost same codes when get the value of pre_version and cur_version in function validate_checkpoint, this patch adds get_checkpoint_version to clean up redundant codes. Signed-off-by: Tiezhu Yang <kernelpatch@126.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
3fa565039e
commit
fc0065adb2
1 changed files with 40 additions and 30 deletions
|
@ -663,45 +663,55 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int get_checkpoint_version(struct f2fs_sb_info *sbi, block_t cp_addr,
|
||||||
|
struct f2fs_checkpoint **cp_block, struct page **cp_page,
|
||||||
|
unsigned long long *version)
|
||||||
|
{
|
||||||
|
unsigned long blk_size = sbi->blocksize;
|
||||||
|
size_t crc_offset = 0;
|
||||||
|
__u32 crc = 0;
|
||||||
|
|
||||||
|
*cp_page = get_meta_page(sbi, cp_addr);
|
||||||
|
*cp_block = (struct f2fs_checkpoint *)page_address(*cp_page);
|
||||||
|
|
||||||
|
crc_offset = le32_to_cpu((*cp_block)->checksum_offset);
|
||||||
|
if (crc_offset >= blk_size) {
|
||||||
|
f2fs_msg(sbi->sb, KERN_WARNING,
|
||||||
|
"invalid crc_offset: %zu", crc_offset);
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
crc = le32_to_cpu(*((__le32 *)((unsigned char *)*cp_block
|
||||||
|
+ crc_offset)));
|
||||||
|
if (!f2fs_crc_valid(sbi, crc, *cp_block, crc_offset)) {
|
||||||
|
f2fs_msg(sbi->sb, KERN_WARNING, "invalid crc value");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
*version = cur_cp_version(*cp_block);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,
|
static struct page *validate_checkpoint(struct f2fs_sb_info *sbi,
|
||||||
block_t cp_addr, unsigned long long *version)
|
block_t cp_addr, unsigned long long *version)
|
||||||
{
|
{
|
||||||
struct page *cp_page_1, *cp_page_2 = NULL;
|
struct page *cp_page_1 = NULL, *cp_page_2 = NULL;
|
||||||
unsigned long blk_size = sbi->blocksize;
|
struct f2fs_checkpoint *cp_block = NULL;
|
||||||
struct f2fs_checkpoint *cp_block;
|
|
||||||
unsigned long long cur_version = 0, pre_version = 0;
|
unsigned long long cur_version = 0, pre_version = 0;
|
||||||
size_t crc_offset;
|
int err;
|
||||||
__u32 crc = 0;
|
|
||||||
|
|
||||||
/* Read the 1st cp block in this CP pack */
|
err = get_checkpoint_version(sbi, cp_addr, &cp_block,
|
||||||
cp_page_1 = get_meta_page(sbi, cp_addr);
|
&cp_page_1, version);
|
||||||
|
if (err)
|
||||||
/* get the version number */
|
|
||||||
cp_block = (struct f2fs_checkpoint *)page_address(cp_page_1);
|
|
||||||
crc_offset = le32_to_cpu(cp_block->checksum_offset);
|
|
||||||
if (crc_offset >= blk_size)
|
|
||||||
goto invalid_cp1;
|
goto invalid_cp1;
|
||||||
|
pre_version = *version;
|
||||||
|
|
||||||
crc = le32_to_cpu(*((__le32 *)((unsigned char *)cp_block + crc_offset)));
|
|
||||||
if (!f2fs_crc_valid(sbi, crc, cp_block, crc_offset))
|
|
||||||
goto invalid_cp1;
|
|
||||||
|
|
||||||
pre_version = cur_cp_version(cp_block);
|
|
||||||
|
|
||||||
/* Read the 2nd cp block in this CP pack */
|
|
||||||
cp_addr += le32_to_cpu(cp_block->cp_pack_total_block_count) - 1;
|
cp_addr += le32_to_cpu(cp_block->cp_pack_total_block_count) - 1;
|
||||||
cp_page_2 = get_meta_page(sbi, cp_addr);
|
err = get_checkpoint_version(sbi, cp_addr, &cp_block,
|
||||||
|
&cp_page_2, version);
|
||||||
cp_block = (struct f2fs_checkpoint *)page_address(cp_page_2);
|
if (err)
|
||||||
crc_offset = le32_to_cpu(cp_block->checksum_offset);
|
|
||||||
if (crc_offset >= blk_size)
|
|
||||||
goto invalid_cp2;
|
goto invalid_cp2;
|
||||||
|
cur_version = *version;
|
||||||
crc = le32_to_cpu(*((__le32 *)((unsigned char *)cp_block + crc_offset)));
|
|
||||||
if (!f2fs_crc_valid(sbi, crc, cp_block, crc_offset))
|
|
||||||
goto invalid_cp2;
|
|
||||||
|
|
||||||
cur_version = cur_cp_version(cp_block);
|
|
||||||
|
|
||||||
if (cur_version == pre_version) {
|
if (cur_version == pre_version) {
|
||||||
*version = cur_version;
|
*version = cur_version;
|
||||||
|
|
Loading…
Reference in a new issue