Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 984ec63c authored by Shawn Lin's avatar Shawn Lin Committed by Jaegeuk Kim
Browse files

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: default avatarShawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 2b39e907

fs/f2fs/checkpoint.c

+4 −0
Original line number Diff line number Diff line
@@ -708,6 +708,10 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	cp_block = (struct f2fs_checkpoint *)page_address(cur_page);

	memcpy(sbi->ckpt, cp_block, blk_size);



	/* Sanity checking of checkpoint */

	if (sanity_check_ckpt(sbi))

		goto fail_no_cp;



	if (cp_blks <= 1)

		goto done;

fs/f2fs/f2fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1783,6 +1783,7 @@ int f2fs_commit_super(struct f2fs_sb_info *, bool); 
int f2fs_sync_fs(struct super_block *, int);

extern __printf(3, 4)

void f2fs_msg(struct super_block *, const char *, const char *, ...);

int sanity_check_ckpt(struct f2fs_sb_info *sbi);



/*

 * hash.c

fs/f2fs/super.c

+1 −9
Original line number Diff line number Diff line
@@ -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 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
		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 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) 
	destroy_node_manager(sbi);

free_sm:

	destroy_segment_manager(sbi);

free_cp:

	kfree(sbi->ckpt);

free_meta_inode:

	make_bad_inode(sbi->meta_inode);