Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35b09d82 authored by Namjae Jeon's avatar Namjae Jeon Committed by Jaegeuk Kim
Browse files

f2fs: push some variables to debug part 



Some, counters are needed only for the statistical information
while debugging.
So, those can be controlled using CONFIG_F2FS_STAT_FS,
pushing the usage for few variables under this flag.

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarAmit Sahrawat <a.sahrawat@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
parent a9841c4d

fs/f2fs/checkpoint.c

+4 −0
Original line number Diff line number Diff line
@@ -478,7 +478,9 @@ void set_dirty_dir_page(struct inode *inode, struct page *page) 
		}

	}

	list_add_tail(&new->list, head);

#ifdef CONFIG_F2FS_STAT_FS

	sbi->n_dirty_dirs++;

#endif



	BUG_ON(!S_ISDIR(inode->i_mode));

out:
@@ -508,7 +510,9 @@ void remove_dirty_dir_inode(struct inode *inode) 
		if (entry->inode == inode) {

			list_del(&entry->list);

			kmem_cache_free(inode_entry_slab, entry);

#ifdef CONFIG_F2FS_STAT_FS

			sbi->n_dirty_dirs--;

#endif

			break;

		}

	}

fs/f2fs/data.c

+6 −0
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs, 
					struct buffer_head *bh_result)

{

	struct f2fs_inode_info *fi = F2FS_I(inode);

#ifdef CONFIG_F2FS_STAT_FS

	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);

#endif

	pgoff_t start_fofs, end_fofs;

	block_t start_blkaddr;
@@ -78,7 +80,9 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs, 
		return 0;

	}



#ifdef CONFIG_F2FS_STAT_FS

	sbi->total_hit_ext++;

#endif

	start_fofs = fi->ext.fofs;

	end_fofs = fi->ext.fofs + fi->ext.len - 1;

	start_blkaddr = fi->ext.blk_addr;
@@ -96,7 +100,9 @@ static int check_extent_cache(struct inode *inode, pgoff_t pgofs, 
		else

			bh_result->b_size = UINT_MAX;



#ifdef CONFIG_F2FS_STAT_FS

		sbi->read_hit_ext++;

#endif

		read_unlock(&fi->ext.ext_lock);

		return 1;

	}

fs/f2fs/f2fs.h

+4 −2
Original line number Diff line number Diff line
@@ -372,7 +372,6 @@ struct f2fs_sb_info { 
	/* for directory inode management */

	struct list_head dir_inode_list;	/* dir inode list */

	spinlock_t dir_inode_lock;		/* for dir inode list lock */

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



	/* basic file system units */

	unsigned int log_sectors_per_block;	/* log2 sectors per block */
@@ -409,12 +408,15 @@ struct f2fs_sb_info { 
	 * for stat information.

	 * one is for the LFS mode, and the other is for the SSR mode.

	 */

#ifdef CONFIG_F2FS_STAT_FS

	struct f2fs_stat_info *stat_info;	/* FS status information */

	unsigned int segment_count[2];		/* # of allocated segments */

	unsigned int block_count[2];		/* # of allocated blocks */

	unsigned int last_victim[2];		/* last victim segment # */

	int total_hit_ext, read_hit_ext;	/* extent cache hit ratio */

	int bg_gc;				/* background gc calls */

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

#endif

	unsigned int last_victim[2];		/* last victim segment # */

	spinlock_t stat_lock;			/* lock for stat operations */

};

fs/f2fs/gc.c

+2 −0
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ static int gc_thread_func(void *data) 
		else

			wait_ms = increase_sleep_time(wait_ms);



#ifdef CONFIG_F2FS_STAT_FS

		sbi->bg_gc++;

#endif



		/* if return value is not zero, no victim was selected */

		if (f2fs_gc(sbi))

fs/f2fs/segment.c

+5 −0
Original line number Diff line number Diff line
@@ -610,7 +610,10 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi, 
	else

		new_curseg(sbi, type, false);

out:

#ifdef CONFIG_F2FS_STAT_FS

	sbi->segment_count[curseg->alloc_type]++;

#endif

	return;

}



void allocate_new_segments(struct f2fs_sb_info *sbi)
@@ -846,7 +849,9 @@ static void do_write_page(struct f2fs_sb_info *sbi, struct page *page, 


	mutex_lock(&sit_i->sentry_lock);

	__refresh_next_blkoff(sbi, curseg);

#ifdef CONFIG_F2FS_STAT_FS

	sbi->block_count[curseg->alloc_type]++;

#endif



	/*

	 * SIT information should be updated before segment allocation,