Skip to contentSkip to conversation

f2fs: introduce macro __cp_payload

PATCH In review Wanpeng Li 2 participants 5 messages Feb 25, 2015 – Feb 27, 2015

Subsystems (2)
lore
Share & tools
lore

Wanpeng Li

author
#0 lore raw

PATCH 1/2 f2fs: introduce macro __cp_payload

This patch introduce macro __cp_payload.

---
 fs/f2fs/checkpoint.c | 7 +++----
 fs/f2fs/f2fs.h       | 7 ++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)
fs/f2fs/checkpoint.c +3 -4
index 7f794b7..4dbcc81 100644
@@ -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
index 7fa3313..f8bde23 100644
@@ -920,12 +920,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
Signature · 9 lines
1.9.1


------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
author
#1 lore raw

PATCH 2/2 f2fs: fix the number of orphan inode blocks

cp_pack_start_sum is calculated in do_checkpoint and is equal to cpu_to_le32(1 + cp_payload_blks + orphan_blocks). The number of orphan inode blocks is take advantage of by recover_orphan_inodes to readahead meta pages and recovery inodes. However, current codes forget to reduce the number of cp payload blocks when calculate the number of orphan inode blocks. This patch fix it.

---
 fs/f2fs/checkpoint.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
fs/f2fs/checkpoint.c +4 -4
index 4dbcc81..db82e09 100644
@@ -464,7 +464,7 @@ static void recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)
 
 void recover_orphan_inodes(struct f2fs_sb_info *sbi)
 {
-	block_t start_blk, orphan_blkaddr, i, j;
+	block_t start_blk, orphan_blocks, i, j;
 
 	if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG))
 		return;
@@ -472,11 +472,11 @@ void recover_orphan_inodes(struct f2fs_sb_info *sbi)
 	set_sbi_flag(sbi, SBI_POR_DOING);
 
 	start_blk = __start_cp_addr(sbi) + 1 + __cp_payload(sbi);
-	orphan_blkaddr = __start_sum_addr(sbi) - 1;
+	orphan_blocks = __start_sum_addr(sbi) - 1 - __cp_payload(sbi);
 
-	ra_meta_pages(sbi, start_blk, orphan_blkaddr, META_CP);
+	ra_meta_pages(sbi, start_blk, orphan_blocks, META_CP);
 
-	for (i = 0; i < orphan_blkaddr; i++) {
+	for (i = 0; i < orphan_blocks; i++) {
 		struct page *page = get_meta_page(sbi, start_blk + i);
 		struct f2fs_orphan_block *orphan_blk;
 
Signature · 1 line
1.9.1
Reviewed-by on v1 2/2
#2 lore raw

RE: [f2fs-dev] [PATCH 2/2] f2fs: fix the number of orphan inode blocks

Hi Wanpeng,

Quoted 7 lines

-----Original Message-----
From: Wanpeng Li [mailto:[email protected]]
Sent: Thursday, February 26, 2015 7:57 AM
To: Jaegeuk Kim
Cc: Wanpeng Li; [email protected]; [email protected]
Subject: [f2fs-dev] [PATCH 2/2] f2fs: fix the number of orphan inode blocks

Quoted 6 lines

cp_pack_start_sum is calculated in do_checkpoint and is equal to cpu_to_le32(1 + cp_payload_blks + orphan_blocks). The number of orphan inode blocks is take advantage of by recover_orphan_inodes to readahead meta pages and recovery inodes. However, current codes forget to reduce the number of cp payload blocks when calculate the number of orphan inode blocks. This patch fix it.

Nice work! looks good to me. :)

Quoted 2 lines
author
#3 lore raw

Re: [f2fs-dev] [PATCH 2/2] f2fs: fix the number of orphan inode blocks

Hi Chao,

Quoted 16 lines · Chao Yu

Hi Wanpeng,

Quoted 7 lines

-----Original Message-----
From: Wanpeng Li [mailto:[email protected]]
Sent: Thursday, February 26, 2015 7:57 AM
To: Jaegeuk Kim
Cc: Wanpeng Li; [email protected]; [email protected]
Subject: [f2fs-dev] [PATCH 2/2] f2fs: fix the number of orphan inode blocks

Quoted 6 lines

cp_pack_start_sum is calculated in do_checkpoint and is equal to cpu_to_le32(1 + cp_payload_blks + orphan_blocks). The number of orphan inode blocks is take advantage of by recover_orphan_inodes to readahead meta pages and recovery inodes. However, current codes forget to reduce the number of cp payload blocks when calculate the number of orphan inode blocks. This patch fix it.

Quoted 6 lines

Nice work! looks good to me. :)

Quoted 2 lines

Thanks for your review. ;-)

Regards,
Wanpeng Li

Reviewed-by on v1 1/2
#4 lore raw
In reply to Wanpeng Li

Hi Wanpeng,

Quoted 8 lines

-----Original Message-----
From: Wanpeng Li [mailto:[email protected]]
Sent: Thursday, February 26, 2015 7:57 AM
To: Jaegeuk Kim
Cc: Wanpeng Li; [email protected]; [email protected]
Subject: [f2fs-dev] [PATCH 1/2] f2fs: introduce macro __cp_payload

This patch introduce macro __cp_payload.

Good work! This patch looks good to me.

Quoted 2 lines