2015-02-27 09:56:53

by Wanpeng Li

Subject: [PATCH v2] 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.

Signed-off-by: Wanpeng Li <[email protected]>
---
v1 -> v2:
* adjust comments above the codes
* fix coding style issue

fs/f2fs/checkpoint.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index db82e09..a914e99 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -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)
--
1.9.1

2015-02-28 09:01:46

by Chao Yu

Subject: RE: [PATCH v2] f2fs: fix max orphan inodes calculation

> -----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
>
> 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.
>
> Signed-off-by: Wanpeng Li <[email protected]>

Reviewed-by: Chao Yu <[email protected]>