[PATCH] f2fs: add F2FS_DIRTY_DATA to has_not_enough_free_secs and need_SSR
From: Yunlong Song
Date: Fri Feb 24 2017 - 07:34:56 EST
Currently, it miss the part of F2FS_DIRTY_DATA to check whether there is enough
free segments for the "reserved_sections" originally set in the mkfs.f2fs. As a
result, it will use the reserved_sections part to write dirty data, and has to
do gc_more to free a lot of sections together next time. This will cost much
time to do so many fggc. So let's add the F2FS_DIRTY_DATA part and do a few gc
gradually each time, which will avoid to do a large number of gc at the same time.
And this will also make sure the pre-set "reserved_sections" is not used all the
time and can be used anytime for gc when ssr segments are not enough.
Signed-off-by: Yunlong Song <yunlong.song@xxxxxxxxxx>
---
fs/f2fs/segment.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index f4020f1..44f2a46 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -490,12 +490,13 @@ static inline bool need_SSR(struct f2fs_sb_info *sbi)
int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);
+ int data_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DATA);
if (test_opt(sbi, LFS))
return false;
return free_sections(sbi) <= (node_secs + 2 * dent_secs + imeta_secs +
- reserved_sections(sbi) + 1);
+ data_secs + reserved_sections(sbi) + 1);
}
static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
@@ -504,13 +505,14 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
int node_secs = get_blocktype_secs(sbi, F2FS_DIRTY_NODES);
int dent_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DENTS);
int imeta_secs = get_blocktype_secs(sbi, F2FS_DIRTY_IMETA);
+ int data_secs = get_blocktype_secs(sbi, F2FS_DIRTY_DATA);
if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
return false;
return (free_sections(sbi) + freed) <=
(node_secs + 2 * dent_secs + imeta_secs +
- reserved_sections(sbi) + needed);
+ data_secs + reserved_sections(sbi) + needed);
}
static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi)
--
1.8.5.2