Commit 55141486 authored by Wanpeng Li's avatar Wanpeng Li Committed by Jaegeuk Kim
Browse files

f2fs: introduce macro __cp_payload 



This patch introduce macro __cp_payload.

Signed-off-by: default avatarWanpeng Li <wanpeng.li@linux.intel.com>
Reviewed-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1abff93d

fs/f2fs/checkpoint.c

+3 −4
Original line number Diff line number Diff line
@@ -471,8 +471,7 @@ void recover_orphan_inodes(struct f2fs_sb_info *sbi) 


	set_sbi_flag(sbi, SBI_POR_DOING);



	start_blk = __start_cp_addr(sbi) + 1 +

		le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

	start_blk = __start_cp_addr(sbi) + 1 + __cp_payload(sbi);

	orphan_blkaddr = __start_sum_addr(sbi) - 1;



	ra_meta_pages(sbi, start_blk, orphan_blkaddr, META_CP);
@@ -615,7 +614,7 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) 
	unsigned long blk_size = sbi->blocksize;

	unsigned long long cp1_version = 0, cp2_version = 0;

	unsigned long long cp_start_blk_no;

	unsigned int cp_blks = 1 + le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

	unsigned int cp_blks = 1 + __cp_payload(sbi);

	block_t cp_blk_no;

	int i;
@@ -884,7 +883,7 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) 
	__u32 crc32 = 0;

	void *kaddr;

	int i;

	int cp_payload_blks = le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

	int cp_payload_blks = __cp_payload(sbi);



	/*

	 * This avoids to conduct wrong roll-forward operations and uses

fs/f2fs/f2fs.h

+6 −1
Original line number Diff line number Diff line
@@ -982,12 +982,17 @@ static inline unsigned long __bitmap_size(struct f2fs_sb_info *sbi, int flag) 
	return 0;

}



static inline block_t __cp_payload(struct f2fs_sb_info *sbi)

{

	return le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

}



static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag)

{

	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi);

	int offset;



	if (le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload) > 0) {

	if (__cp_payload(sbi) > 0) {

		if (flag == NAT_BITMAP)

			return &ckpt->sit_nat_version_bitmap;

		else