Skip to contentSkip to conversation

f2fs: fix max orphan inodes calculation

PATCH In review Wanpeng Li 3 participants 6 messages Feb 27, 2015 – Mar 8, 2015

Subsystems (2)
lore
Share & tools
lore

Wanpeng Li

author
#0 lore raw

PATCH v2 1/1 f2fs: fix max orphan inodes calculation

cp_payload is introduced for sit bitmap to support large volume, and it is just after the block of f2fs_checkpoint + nat bitmap, so the first segment should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks. However, current max orphan inodes calculation don't consider cp_payload, this patch fix it by reducing the number of cp_payload from total blocks of the first segment when calculate max orphan inodes.

---
v1 -> v2:
* adjust comments above the codes
* fix coding style issue

 fs/f2fs/checkpoint.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
fs/f2fs/checkpoint.c +7 -5
index db82e09..a914e99 100644
@@ -1103,13 +1103,15 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
 	}
 
 	/*
-	 * considering 512 blocks in a segment 8 blocks are needed for cp
-	 * and log segment summaries. Remaining blocks are used to keep
-	 * orphan entries with the limitation one reserved segment
-	 * for cp pack we can have max 1020*504 orphan entries
+	 * considering 512 blocks in a segment 8+cp_payload blocks are
+	 * needed for cp and log segment summaries. Remaining blocks are
+	 * used to keep orphan entries with the limitation one reserved
+	 * segment for cp pack we can have max 1020*(504-cp_payload)
+	 * orphan entries
 	 */
 	sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
-			NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
+			NR_CURSEG_TYPE - __cp_payload(sbi)) *
+				F2FS_ORPHANS_PER_BLOCK;
 }
 
 int __init create_checkpoint_caches(void)
Signature · 1 line
1.9.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 8 lines

-----Original Message-----
From: Wanpeng Li [mailto:[email protected]]
Sent: Friday, February 27, 2015 5:38 PM
To: Jaegeuk Kim
Cc: Changman Lee; Chao Yu; [email protected]; [email protected]; [email protected]; Wanpeng Li
Subject: [PATCH v2] f2fs: fix max orphan inodes calculation

Quoted 8 lines

cp_payload is introduced for sit bitmap to support large volume, and it is just after the block of f2fs_checkpoint + nat bitmap, so the first segment should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks. However, current max orphan inodes calculation don't consider cp_payload, this patch fix it by reducing the number of cp_payload from total blocks of the first segment when calculate max orphan inodes.

#2 lore raw
In reply to Wanpeng Li
Quoted 24 lines · Wanpeng Li

cp_payload is introduced for sit bitmap to support large volume, and it is just after the block of f2fs_checkpoint + nat bitmap, so the first segment should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks. However, current max orphan inodes calculation don't consider cp_payload, this patch fix it by reducing the number of cp_payload from total blocks of the first segment when calculate max orphan inodes.

---
v1 -> v2:
* adjust comments above the codes
* fix coding style issue

 fs/f2fs/checkpoint.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
fs/f2fs/checkpoint.c +0 -0
index db82e09..a914e99 100644
@@ -1103,13 +1103,15 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
 	}
 
 	/*

fs/f2fs/checkpoint.c void init_ino_entry_info(struct f2fs_sb_info *sbi) · line 1111

Quoted 10 lines
fs/f2fs/checkpoint.c +5 -4
-	 * considering 512 blocks in a segment 8 blocks are needed for cp
-	 * and log segment summaries. Remaining blocks are used to keep
-	 * orphan entries with the limitation one reserved segment
-	 * for cp pack we can have max 1020*504 orphan entries
+	 * considering 512 blocks in a segment 8+cp_payload blocks are
+	 * needed for cp and log segment summaries. Remaining blocks are
+	 * used to keep orphan entries with the limitation one reserved
+	 * segment for cp pack we can have max 1020*(504-cp_payload)
+	 * orphan entries
 	 */

Hi all,

I think below code give us information enough so it doesn't need to describe above comments. And someone could get confused by 1020 constants. How do you think about removing comments.

Regards,
Changman

Quoted 9 lines
fs/f2fs/checkpoint.c +2 -1
 	sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
-			NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
+			NR_CURSEG_TYPE - __cp_payload(sbi)) *
+				F2FS_ORPHANS_PER_BLOCK;
 }
 
 int __init create_checkpoint_caches(void)
Signature · 1 line
1.9.1
#3 lore raw

Hi Changman,

Quoted 45 lines

-----Original Message-----
From: Changman Lee [mailto:[email protected]]
Sent: Tuesday, March 03, 2015 9:40 AM
To: [email protected]
Cc: Jaegeuk Kim; Chao Yu; [email protected]; [email protected]
Subject: Re: [PATCH v2] f2fs: fix max orphan inodes calculation

Quoted 24 lines · Wanpeng Li

cp_payload is introduced for sit bitmap to support large volume, and it is just after the block of f2fs_checkpoint + nat bitmap, so the first segment should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks. However, current max orphan inodes calculation don't consider cp_payload, this patch fix it by reducing the number of cp_payload from total blocks of the first segment when calculate max orphan inodes.

---
v1 -> v2:
* adjust comments above the codes
* fix coding style issue

 fs/f2fs/checkpoint.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
fs/f2fs/checkpoint.c +0 -0
index db82e09..a914e99 100644
@@ -1103,13 +1103,15 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
 	}
 
 	/*

fs/f2fs/checkpoint.c void init_ino_entry_info(struct f2fs_sb_info *sbi) · line 1111

Quoted 10 lines
fs/f2fs/checkpoint.c +5 -4
-	 * considering 512 blocks in a segment 8 blocks are needed for cp
-	 * and log segment summaries. Remaining blocks are used to keep
-	 * orphan entries with the limitation one reserved segment
-	 * for cp pack we can have max 1020*504 orphan entries
+	 * considering 512 blocks in a segment 8+cp_payload blocks are
+	 * needed for cp and log segment summaries. Remaining blocks are
+	 * used to keep orphan entries with the limitation one reserved
+	 * segment for cp pack we can have max 1020*(504-cp_payload)
+	 * orphan entries
 	 */

Hi all,

Quoted 3 lines

I think below code give us information enough so it doesn't need to describe above comments. And someone could get confused by 1020 constants. How do you think about removing comments.

I agree with you.

There are nothing special need to be pay attention for the below statement, all meaning of statement could be easily readed as each macro in statement can indicate meaning of itself clearly.

So could you send another patch to remove it?

Thanks,

Quoted 13 lines

Regards,
Changman

Quoted 9 lines
fs/f2fs/checkpoint.c +2 -2
 	sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
-			NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
+			NR_CURSEG_TYPE - __cp_payload(sbi)) *
+				F2FS_ORPHANS_PER_BLOCK;
 }
 
 int __init create_checkpoint_caches(void)
--

1.9.1

author
#4 lore raw

Hi Changman,

Quoted 51 lines · Chao Yu

Hi Changman,

Quoted 45 lines

-----Original Message-----
From: Changman Lee [mailto:[email protected]]
Sent: Tuesday, March 03, 2015 9:40 AM
To: [email protected]
Cc: Jaegeuk Kim; Chao Yu; [email protected]; [email protected]
Subject: Re: [PATCH v2] f2fs: fix max orphan inodes calculation

Quoted 24 lines · Wanpeng Li

cp_payload is introduced for sit bitmap to support large volume, and it is just after the block of f2fs_checkpoint + nat bitmap, so the first segment should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks. However, current max orphan inodes calculation don't consider cp_payload, this patch fix it by reducing the number of cp_payload from total blocks of the first segment when calculate max orphan inodes.

---
v1 -> v2:
* adjust comments above the codes
* fix coding style issue

 fs/f2fs/checkpoint.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
fs/f2fs/checkpoint.c +0 -0
index db82e09..a914e99 100644
@@ -1103,13 +1103,15 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
 	}
 
 	/*

fs/f2fs/checkpoint.c void init_ino_entry_info(struct f2fs_sb_info *sbi) · line 1111

Quoted 10 lines
fs/f2fs/checkpoint.c +5 -4
-	 * considering 512 blocks in a segment 8 blocks are needed for cp
-	 * and log segment summaries. Remaining blocks are used to keep
-	 * orphan entries with the limitation one reserved segment
-	 * for cp pack we can have max 1020*504 orphan entries
+	 * considering 512 blocks in a segment 8+cp_payload blocks are
+	 * needed for cp and log segment summaries. Remaining blocks are
+	 * used to keep orphan entries with the limitation one reserved
+	 * segment for cp pack we can have max 1020*(504-cp_payload)
+	 * orphan entries
 	 */

Hi all,

Quoted 3 lines

I think below code give us information enough so it doesn't need to describe above comments. And someone could get confused by 1020 constants. How do you think about removing comments.

Quoted 7 lines

I agree with you.

There are nothing special need to be pay attention for the below statement, all meaning of statement could be easily readed as each macro in statement can indicate meaning of itself clearly.

So could you send another patch to remove it?

Agreed. You can cleanup it. ;-)

Regards,
Wanpeng Li

Quoted 13 lines

Thanks,

Quoted 10 lines

Regards,
Changman

Quoted 6 lines
fs/f2fs/checkpoint.c +2 -1
 	sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
-			NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
+			NR_CURSEG_TYPE - __cp_payload(sbi)) *
+				F2FS_ORPHANS_PER_BLOCK;
 }
 
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
fs/f2fs/checkpoint.c +0 -1
 int __init create_checkpoint_caches(void)
--

1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

------------------------------------------------------------------------------
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/

#5 lore raw
In reply to Chao Yu

--> 8 --

Quoted 1 line

From ce2462523dd5940b59f770c09a50d4babff5fcdb Mon Sep 17 00:00:00 2001

From: Changman Lee <[email protected]>
Date: Mon, 9 Mar 2015 08:07:04 +0900
Subject: [PATCH] f2fs: cleanup statement about max orphan inodes calc

Through each macro, we can read the meaning easily.

---
 fs/f2fs/checkpoint.c | 7 -------
 1 file changed, 7 deletions(-)
fs/f2fs/checkpoint.c +0 -7
index 53bc328..384bfc4 100644
@@ -1104,13 +1104,6 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
 		im->ino_num = 0;
 	}
 
-	/*
-	 * considering 512 blocks in a segment 8+cp_payload blocks are
-	 * needed for cp and log segment summaries. Remaining blocks are
-	 * used to keep orphan entries with the limitation one reserved
-	 * segment for cp pack we can have max 1020*(504-cp_payload)
-	 * orphan entries
-	 */
 	sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
 			NR_CURSEG_TYPE - __cp_payload(sbi)) *
 				F2FS_ORPHANS_PER_BLOCK;
Signature · 1 line
1.9.1