From 554df79e523d14dab475eb6650cb96617256ceea Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Fri, 19 Jun 2015 13:41:23 -0700 Subject: f2fs: shrink extent_cache entries This patch registers shrinking extent_caches. Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- fs/f2fs/shrinker.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'fs/f2fs/shrinker.c') diff --git a/fs/f2fs/shrinker.c b/fs/f2fs/shrinker.c index c4bd6ee5936c..1f0a131be3d2 100644 --- a/fs/f2fs/shrinker.c +++ b/fs/f2fs/shrinker.c @@ -23,6 +23,11 @@ static unsigned long __count_nat_entries(struct f2fs_sb_info *sbi) return NM_I(sbi)->nat_cnt - NM_I(sbi)->dirty_nat_cnt; } +static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi) +{ + return sbi->total_ext_tree + atomic_read(&sbi->total_ext_node); +} + unsigned long f2fs_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { @@ -42,6 +47,9 @@ unsigned long f2fs_shrink_count(struct shrinker *shrink, } spin_unlock(&f2fs_list_lock); + /* count extent cache entries */ + count += __count_extent_cache(sbi); + /* shrink clean nat cache entries */ count += __count_nat_entries(sbi); @@ -82,8 +90,12 @@ unsigned long f2fs_shrink_scan(struct shrinker *shrink, sbi->shrinker_run_no = run_no; + /* shrink extent cache entries */ + freed += f2fs_shrink_extent_tree(sbi, nr >> 1); + /* shrink clean nat cache entries */ - freed += try_to_free_nats(sbi, nr); + if (freed < nr) + freed += try_to_free_nats(sbi, nr - freed); spin_lock(&f2fs_list_lock); p = p->next; -- cgit v1.2.3