f2fs: use atomic for counting inode with inline_{dir,inode} flag
Subsystems (2)
PATCH 1/1 f2fs: use atomic for counting inode with inline_{dir,inode} flag
As inline_{dir,inode} stat is increased/decreased concurrently by multi threads, so the value is not so accurate, let's use atomic type for counting accurately.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/debug.c | 7 +++++-- fs/f2fs/f2fs.h | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-)
fs/f2fs/debug.c +5 -2
@@ -46,8 +46,8 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->valid_count =valid_user_blocks (sbi); si->valid_node_count =valid_node_count (sbi); si->valid_inode_count =valid_inode_count (sbi); - si->inline_inode = sbi->inline_inode; - si->inline_dir = sbi->inline_dir; + si->inline_inode =atomic_read (&sbi->inline_inode); + si->inline_dir =atomic_read (&sbi->inline_dir); si->utilization =utilization (sbi); si->free_segs =free_segments (sbi);
@@ -329,6 +329,9 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi) si->sbi = sbi; sbi->stat_info = si; +atomic_set (&sbi->inline_inode,0 ); +atomic_set (&sbi->inline_dir,0 ); +mutex_lock (&f2fs_stat_mutex);list_add_tail (&si->stat_list, &f2fs_stat_list);mutex_unlock (&f2fs_stat_mutex);
fs/f2fs/f2fs.h +6 -6
@@ -590,8 +590,8 @@ struct f2fs_sb_info {unsigned int segment_count[2 ];/* # of allocated segments */ unsigned int block_count[2 ];/* # of allocated blocks */ int total_hit_ext, read_hit_ext;/* extent cache hit ratio */ -int inline_inode;/* # of inline_data inodes */ -int inline_dir;/* # of inline_dentry inodes */ +atomic_t inline_inode;/* # of inline_data inodes */ +atomic_t inline_dir;/* # of inline_dentry inodes */ int bg_gc;/* background gc calls */ unsigned int n_dirty_dirs;/* # of dir inodes */ #endif
@@ -1532,22 +1532,22 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)#define stat_inc_inline_inode (inode) \ do { \ if (f2fs_has_inline_data(inode)) \ - ((F2FS_I_SB(inode))->inline_inode++); \ + (atomic_inc(&F2FS_I_SB(inode)->inline_inode)); \ } while (0)#define stat_dec_inline_inode (inode) \ do { \ if (f2fs_has_inline_data(inode)) \ - ((F2FS_I_SB(inode))->inline_inode--); \ + (atomic_dec(&F2FS_I_SB(inode)->inline_inode)); \ } while (0)#define stat_inc_inline_dir (inode) \ do { \ if (f2fs_has_inline_dentry(inode)) \ - ((F2FS_I_SB(inode))->inline_dir++); \ + (atomic_inc(&F2FS_I_SB(inode)->inline_dir)); \ } while (0)#define stat_dec_inline_dir (inode) \ do { \ if (f2fs_has_inline_dentry(inode)) \ - ((F2FS_I_SB(inode))->inline_dir--); \ + (atomic_dec(&F2FS_I_SB(inode)->inline_dir)); \ } while (0)#define stat_inc_seg_type (sbi, curseg) \ ((sbi)->segment_count[(curseg)->alloc_type]++)
Signature · 1 line
2.1.2