f2fs: avoid infinite loop on cp_error
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: avoid infinite loop on cp_error
If cp_error is set, we should avoid all the infinite loop. In f2fs_sync_file, there is a hole, and this patch fixes that.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/file.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/file.c +4 -0
@@ -247,6 +247,10 @@ go_write: sync_nodes:sync_node_pages (sbi, ino, &wbc); +/* if cp_error was enabled, we should avoid infinite loop */ +if (unlikely (f2fs_cp_error (sbi))) + goto out; +if (need_inode_block_update (sbi, ino)) {mark_inode_dirty_sync (inode);f2fs_write_inode (inode,NULL );
Signature · 1 line
2.1.1
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: update memory footprint information
This patch adds missing memory usages, and splits them in detail.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/debug.c | 24 +++++++++++++++++------- fs/f2fs/f2fs.h | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-)
fs/f2fs/debug.c +17 -7
@@ -177,13 +177,18 @@ get_cache:/* free nids */ 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; - si->cache_mem += npages <<PAGE_CACHE_SHIFT ; + si->cache_mem +=NM_I (sbi)->dirty_nat_cnt * +sizeof (struct nat_entry_set ); + si->cache_mem += si->inmem_pages *sizeof (struct inmem_pages ); si->cache_mem += sbi->n_dirty_dirs *sizeof (struct inode_entry );for (i =0 ; i <=UPDATE_INO ; i++) si->cache_mem += sbi->im[i].ino_num *sizeof (struct ino_entry ); + + si->page_mem =0 ; + npages =NODE_MAPPING (sbi)->nrpages; + si->page_mem += npages <<PAGE_CACHE_SHIFT ; + npages =META_MAPPING (sbi)->nrpages; + si->page_mem += npages <<PAGE_CACHE_SHIFT ; }static int stat_show (struct seq_file *s,void *v)
@@ -301,9 +306,14 @@ static int stat_show(struct seq_file *s, void *v)/* memory footprint */ update_mem_info (si->sbi); -seq_printf (s,"\nMemory: %u KB = static: %u + cached: %u\n" , - (si->base_mem + si->cache_mem) >>10 , - si->base_mem >>10 , si->cache_mem >>10 ); +seq_printf (s,"\nMemory: %u KB\n" , + (si->base_mem + si->cache_mem + si->page_mem) >>10 ); +seq_printf (s," - static: %u KB\n" , + si->base_mem >>10 ); +seq_printf (s," - cached: %u KB\n" , + si->cache_mem >>10 ); +seq_printf (s," - paged : %u KB\n" , + si->page_mem >>10 ); }mutex_unlock (&f2fs_stat_mutex);return 0 ;
fs/f2fs/f2fs.h +1 -1
@@ -1530,7 +1530,7 @@ struct f2fs_stat_info {unsigned int segment_count[2 ];unsigned int block_count[2 ];unsigned int inplace_count; -unsigned base_mem, cache_mem; +unsigned base_mem, cache_mem, page_mem; };static inline struct f2fs_stat_info *F2FS_STAT (struct f2fs_sb_info *sbi)
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet