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

Commit 2bb74757 authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Jaegeuk Kim
Browse files

f2fs: cleanup duplicate stats for atomic files 



Remove duplicate sbi->aw_cnt stats counter that tracks
the number of atomic files currently opened (it also shows
incorrect value sometimes). Use more relit lable sbi->atomic_files
to show in the stats.

Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 6d33f53c

fs/f2fs/debug.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) 
	si->nquota_files = sbi->nquota_files;

	si->nquota_files = sbi->nquota_files;

	si->ndirty_all = sbi->ndirty_inode[DIRTY_META];

	si->ndirty_all = sbi->ndirty_inode[DIRTY_META];

	si->inmem_pages = get_pages(sbi, F2FS_INMEM_PAGES);

	si->inmem_pages = get_pages(sbi, F2FS_INMEM_PAGES);

	si->aw_cnt = atomic_read(&sbi->aw_cnt);

	si->aw_cnt = sbi->atomic_files;

	si->vw_cnt = atomic_read(&sbi->vw_cnt);

	si->vw_cnt = atomic_read(&sbi->vw_cnt);

	si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);

	si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);

	si->max_vw_cnt = atomic_read(&sbi->max_vw_cnt);

	si->max_vw_cnt = atomic_read(&sbi->max_vw_cnt);
@@ -495,7 +495,6 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi) 
	for (i = META_CP; i < META_MAX; i++)

	for (i = META_CP; i < META_MAX; i++)

		atomic_set(&sbi->meta_count[i], 0);

		atomic_set(&sbi->meta_count[i], 0);





	atomic_set(&sbi->aw_cnt, 0);

	atomic_set(&sbi->vw_cnt, 0);

	atomic_set(&sbi->vw_cnt, 0);

	atomic_set(&sbi->max_aw_cnt, 0);

	atomic_set(&sbi->max_aw_cnt, 0);

	atomic_set(&sbi->max_vw_cnt, 0);

	atomic_set(&sbi->max_vw_cnt, 0);

fs/f2fs/f2fs.h

+1 −6
Original line number Original line Diff line number Diff line
@@ -1327,7 +1327,6 @@ struct f2fs_sb_info { 
	atomic_t inline_xattr;			/* # of inline_xattr inodes */

	atomic_t inline_xattr;			/* # of inline_xattr inodes */

	atomic_t inline_inode;			/* # of inline_data inodes */

	atomic_t inline_inode;			/* # of inline_data inodes */

	atomic_t inline_dir;			/* # of inline_dentry inodes */

	atomic_t inline_dir;			/* # of inline_dentry inodes */

	atomic_t aw_cnt;			/* # of atomic writes */

	atomic_t vw_cnt;			/* # of volatile writes */

	atomic_t vw_cnt;			/* # of volatile writes */

	atomic_t max_aw_cnt;			/* max # of atomic writes */

	atomic_t max_aw_cnt;			/* max # of atomic writes */

	atomic_t max_vw_cnt;			/* max # of volatile writes */

	atomic_t max_vw_cnt;			/* max # of volatile writes */
@@ -3387,13 +3386,9 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi) 
		((sbi)->block_count[(curseg)->alloc_type]++)

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

#define stat_inc_inplace_blocks(sbi)					\

#define stat_inc_inplace_blocks(sbi)					\

		(atomic_inc(&(sbi)->inplace_count))

		(atomic_inc(&(sbi)->inplace_count))

#define stat_inc_atomic_write(inode)					\

		(atomic_inc(&F2FS_I_SB(inode)->aw_cnt))

#define stat_dec_atomic_write(inode)					\

		(atomic_dec(&F2FS_I_SB(inode)->aw_cnt))

#define stat_update_max_atomic_write(inode)				\

#define stat_update_max_atomic_write(inode)				\

	do {								\

	do {								\

		int cur = atomic_read(&F2FS_I_SB(inode)->aw_cnt);	\

		int cur = F2FS_I_SB(inode)->atomic_files;	\

		int max = atomic_read(&F2FS_I_SB(inode)->max_aw_cnt);	\

		int max = atomic_read(&F2FS_I_SB(inode)->max_aw_cnt);	\

		if (cur > max)						\

		if (cur > max)						\

			atomic_set(&F2FS_I_SB(inode)->max_aw_cnt, cur);	\

			atomic_set(&F2FS_I_SB(inode)->max_aw_cnt, cur);	\

fs/f2fs/file.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1933,7 +1933,6 @@ static int f2fs_ioc_start_atomic_write(struct file *filp) 




	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

	F2FS_I(inode)->inmem_task = current;

	F2FS_I(inode)->inmem_task = current;

	stat_inc_atomic_write(inode);

	stat_update_max_atomic_write(inode);

	stat_update_max_atomic_write(inode);

out:

out:

	inode_unlock(inode);

	inode_unlock(inode);

fs/f2fs/segment.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -334,7 +334,6 @@ void f2fs_drop_inmem_pages(struct inode *inode) 
	}

	}





	fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0;

	fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0;

	stat_dec_atomic_write(inode);





	spin_lock(&sbi->inode_lock[ATOMIC_FILE]);

	spin_lock(&sbi->inode_lock[ATOMIC_FILE]);

	if (!list_empty(&fi->inmem_ilist))

	if (!list_empty(&fi->inmem_ilist))