|
@@ -163,13 +163,20 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
|
|
|
si->base_mem += sizeof(struct f2fs_nm_info);
|
|
|
si->base_mem += __bitmap_size(sbi, NAT_BITMAP);
|
|
|
|
|
|
+get_cache:
|
|
|
+ si->cache_mem = 0;
|
|
|
+
|
|
|
/* build gc */
|
|
|
- si->base_mem += sizeof(struct f2fs_gc_kthread);
|
|
|
+ if (sbi->gc_thread)
|
|
|
+ si->cache_mem += sizeof(struct f2fs_gc_kthread);
|
|
|
+
|
|
|
+ /* build merge flush thread */
|
|
|
+ if (SM_I(sbi)->cmd_control_info)
|
|
|
+ si->cache_mem += sizeof(struct flush_cmd_control);
|
|
|
|
|
|
-get_cache:
|
|
|
/* free nids */
|
|
|
- si->cache_mem = NM_I(sbi)->fcnt;
|
|
|
- si->cache_mem += NM_I(sbi)->nat_cnt;
|
|
|
+ si->cache_mem += NM_I(sbi)->fcnt * sizeof(struct free_nid);
|
|
|
+ si->cache_mem += NM_I(sbi)->nat_cnt * sizeof(struct nat_entry);
|
|
|
npages = NODE_MAPPING(sbi)->nrpages;
|
|
|
si->cache_mem += npages << PAGE_CACHE_SHIFT;
|
|
|
npages = META_MAPPING(sbi)->nrpages;
|