summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorWanpeng Li <wanpeng.li@linux.intel.com>2015-02-27 10:38:13 +0100
committerJaegeuk Kim <jaegeuk@kernel.org>2015-04-11 00:08:29 +0200
commit14b42817763903070fa8cbf087369461400cc021 (patch)
treedaa865e4268eb87ddfd208649b79cb15b51b5679 /fs/f2fs
parentf2fs: don't need to collect dirty sit entries and flush journal when there's ... (diff)
downloadlinux-14b42817763903070fa8cbf087369461400cc021.tar.xz
linux-14b42817763903070fa8cbf087369461400cc021.zip
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 <wanpeng.li@linux.intel.com> Reviewed-by: Chao Yu <chao2.yu@samsung.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/checkpoint.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index e9f30abbb6fe..81d6d2f0e8ed 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1104,13 +1104,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)