diff options
| author | Shawn Lin <shawn.lin@rock-chips.com> | 2016-02-17 11:26:32 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-02-22 21:39:56 -0800 |
| commit | 984ec63c5a82a07ad4490ecc69bebacd23f6fa64 (patch) | |
| tree | c82497b491d16a1b48d812319fbba0e04e755b19 /fs/f2fs/super.c | |
| parent | 2b39e9072d79ab2525100413f3f7a0b8a3e15873 (diff) | |
| download | linux-984ec63c5a82a07ad4490ecc69bebacd23f6fa64.tar.gz linux-984ec63c5a82a07ad4490ecc69bebacd23f6fa64.tar.bz2 linux-984ec63c5a82a07ad4490ecc69bebacd23f6fa64.zip | |
f2fs: move sanity checking of cp into get_valid_checkpoint
>From the function name of get_valid_checkpoint, it seems to return
the valid cp or NULL for caller to check. If no valid one is found,
f2fs_fill_super will print the err log. But if get_valid_checkpoint
get one valid(the return value indicate that it's valid, however actually
it is invalid after sanity checking), then print another similar err
log. That seems strange. Let's keep sanity checking inside the procedure
of geting valid cp. Another improvement we gained from this move is
that even the large volume is supported, we check the cp in advanced
to skip the following procedure if failing the sanity checking.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/super.c')
| -rw-r--r-- | fs/f2fs/super.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 9e9493999bf3..ebe5970315e9 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1106,7 +1106,7 @@ static int sanity_check_raw_super(struct super_block *sb, return 0; } -static int sanity_check_ckpt(struct f2fs_sb_info *sbi) +int sanity_check_ckpt(struct f2fs_sb_info *sbi) { unsigned int total, fsmeta; struct f2fs_super_block *raw_super = F2FS_RAW_SUPER(sbi); @@ -1365,13 +1365,6 @@ try_onemore: goto free_meta_inode; } - /* sanity checking of checkpoint */ - err = -EINVAL; - if (sanity_check_ckpt(sbi)) { - f2fs_msg(sb, KERN_ERR, "Invalid F2FS checkpoint"); - goto free_cp; - } - sbi->total_valid_node_count = le32_to_cpu(sbi->ckpt->valid_node_count); sbi->total_valid_inode_count = @@ -1539,7 +1532,6 @@ free_nm: destroy_node_manager(sbi); free_sm: destroy_segment_manager(sbi); -free_cp: kfree(sbi->ckpt); free_meta_inode: make_bad_inode(sbi->meta_inode); |