Commit 3289c061 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: add stat info for inline_dentry inodes 



This patch adds status information for inline_dentry inodes.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent bce8d112

fs/f2fs/debug.c

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static void update_general_status(struct f2fs_sb_info *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->utilization = utilization(sbi);



	si->free_segs = free_segments(sbi);
@@ -200,6 +201,8 @@ static int stat_show(struct seq_file *s, void *v) 
			   si->valid_count - si->valid_node_count);

		seq_printf(s, "  - Inline_data Inode: %u\n",

			   si->inline_inode);

		seq_printf(s, "  - Inline_dentry Inode: %u\n",

			   si->inline_dir);

		seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",

			   si->main_area_segs, si->main_area_sections,

			   si->main_area_zones);

fs/f2fs/f2fs.h

+14 −2
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ struct f2fs_sb_info { 
	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 */

	int bg_gc;				/* background gc calls */

	unsigned int n_dirty_dirs;		/* # of dir inodes */

#endif
@@ -1434,7 +1435,7 @@ struct f2fs_stat_info { 
	int ndirty_node, ndirty_dent, ndirty_dirs, ndirty_meta;

	int nats, sits, fnids;

	int total_count, utilization;

	int bg_gc, inline_inode;

	int bg_gc, inline_inode, inline_dir;

	unsigned int valid_count, valid_node_count, valid_inode_count;

	unsigned int bimodal, avg_vblocks;

	int util_free, util_valid, util_invalid;
@@ -1474,7 +1475,16 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi) 
		if (f2fs_has_inline_data(inode))			\

			((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++);		\

	} while (0)

#define stat_dec_inline_dir(inode)					\

	do {								\

		if (f2fs_has_inline_dentry(inode))			\

			((F2FS_I_SB(inode))->inline_dir--);		\

	} while (0)

#define stat_inc_seg_type(sbi, curseg)					\

		((sbi)->segment_count[(curseg)->alloc_type]++)

#define stat_inc_block_count(sbi, curseg)				\
@@ -1521,6 +1531,8 @@ void f2fs_destroy_root_stats(void); 
#define stat_inc_read_hit(sb)

#define stat_inc_inline_inode(inode)

#define stat_dec_inline_inode(inode)

#define stat_inc_inline_dir(inode)

#define stat_dec_inline_dir(inode)

#define stat_inc_seg_type(sbi, curseg)

#define stat_inc_block_count(sbi, curseg)

#define stat_inc_seg_count(si, type)

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -382,8 +382,8 @@ int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage, 
	/* clear inline dir and flag after data writeback */

	zero_user_segment(ipage, INLINE_DATA_OFFSET,

				 INLINE_DATA_OFFSET + MAX_INLINE_DATA);

	stat_dec_inline_dir(dir);

	clear_inode_flag(F2FS_I(dir), FI_INLINE_DENTRY);

	stat_dec_inline_inode(dir);



	if (i_size_read(dir) < PAGE_CACHE_SIZE) {

		i_size_write(dir, PAGE_CACHE_SIZE);

fs/f2fs/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) 
		goto bad_inode;

	}

	unlock_new_inode(inode);

	stat_inc_inline_dir(inode);

	trace_f2fs_iget(inode);

	return inode;
@@ -300,6 +301,7 @@ void f2fs_evict_inode(struct inode *inode) 


	sb_end_intwrite(inode->i_sb);

no_delete:

	stat_dec_inline_dir(inode);

	invalidate_mapping_pages(NODE_MAPPING(sbi), inode->i_ino, inode->i_ino);

	if (xnid)

		invalidate_mapping_pages(NODE_MAPPING(sbi), xnid, xnid);
@@ -327,6 +329,7 @@ void handle_failed_inode(struct inode *inode) 
	remove_inode_page(inode);

	stat_dec_inline_inode(inode);



	clear_inode_flag(F2FS_I(inode), FI_INLINE_DENTRY);

	alloc_nid_failed(sbi, inode->i_ino);

	f2fs_unlock_op(sbi);

fs/f2fs/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) 
		goto out_fail;

	f2fs_unlock_op(sbi);



	stat_inc_inline_dir(inode);

	alloc_nid_done(sbi, inode->i_ino);



	d_instantiate(dentry, inode);