openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 10:10:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs-tools: introduce get_checkpoint_version() for cleanup

Browse Source 
Just cleanup, no logic change.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2019-06-13 16:09:03 +08:00 committed by Jaegeuk Kim
parent 1d1a54e548
commit b0ca7ec4f6
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fsck/mount.c
View File

@ -780,6 +780,24 @@ static int verify_checksum_chksum(struct f2fs_checkpoint *cp)
return 0;
}
static void *get_checkpoint_version(block_t cp_addr)
{
void *cp_page;
cp_page = malloc(PAGE_SIZE);
ASSERT(cp_page);
if (dev_read_block(cp_page, cp_addr) < 0)
ASSERT(0);
if (verify_checksum_chksum((struct f2fs_checkpoint *)cp_page))
goto out;
return cp_page;
out:
free(cp_page);
return NULL;
}
void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr,
unsigned long long *version)
{
@ -788,34 +806,23 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr,
unsigned long long cur_version = 0, pre_version = 0;
/* Read the 1st cp block in this CP pack */
cp_page_1 = malloc(PAGE_SIZE);
ASSERT(cp_page_1);
if (dev_read_block(cp_page_1, cp_addr) < 0)
goto invalid_cp1;
cp_page_1 = get_checkpoint_version(cp_addr);
if (!cp_page_1)
return NULL;
cp = (struct f2fs_checkpoint *)cp_page_1;
if (verify_checksum_chksum(cp))
goto invalid_cp1;
if (get_cp(cp_pack_total_block_count) > sbi->blocks_per_seg)
goto invalid_cp1;
pre_version = get_cp(checkpoint_ver);
/* Read the 2nd cp block in this CP pack */
cp_page_2 = malloc(PAGE_SIZE);
ASSERT(cp_page_2);
cp_addr += get_cp(cp_pack_total_block_count) - 1;
if (dev_read_block(cp_page_2, cp_addr) < 0)
goto invalid_cp2;
cp_page_2 = get_checkpoint_version(cp_addr);
if (!cp_page_2)
goto invalid_cp1;
cp = (struct f2fs_checkpoint *)cp_page_2;
if (verify_checksum_chksum(cp))
goto invalid_cp2;
cur_version = get_cp(checkpoint_ver);
if (cur_version == pre_version) {
@ -824,7 +831,6 @@ void *validate_checkpoint(struct f2fs_sb_info *sbi, block_t cp_addr,
return cp_page_1;
}
invalid_cp2:
free(cp_page_2);
invalid_cp1:
free(cp_page_1);