Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs: change to use atomic_t type form sbi.atomic_files

Browse Source 
inode_lock[ATOMIC_FILE] was used for protecting sbi->atomic_files,
update atomic_files variable's type to atomic_t instead of unsigned
int, then inode_lock[ATOMIC_FILE] can be obsoleted.

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2022-10-04 09:41:02 +08:00 committed by Jaegeuk Kim
parent 8ec071c363
commit b4dac1203f
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/f2fs/debug.c
View File

@ -91,7 +91,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
si->ndirty_files = sbi->ndirty_inode[FILE_INODE]; si->ndirty_files = sbi->ndirty_inode[FILE_INODE];
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->aw_cnt = sbi->atomic_files; si->aw_cnt = atomic_read(&sbi->atomic_files);
si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt); si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);
si->nr_dio_read = get_pages(sbi, F2FS_DIO_READ); si->nr_dio_read = get_pages(sbi, F2FS_DIO_READ);
si->nr_dio_write = get_pages(sbi, F2FS_DIO_WRITE); si->nr_dio_write = get_pages(sbi, F2FS_DIO_WRITE);
@ -611,6 +611,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
atomic_set(&sbi->compr_inode, 0); atomic_set(&sbi->compr_inode, 0);
atomic64_set(&sbi->compr_blocks, 0); atomic64_set(&sbi->compr_blocks, 0);
atomic_set(&sbi->swapfile_inode, 0); atomic_set(&sbi->swapfile_inode, 0);
atomic_set(&sbi->atomic_files, 0);
atomic_set(&sbi->inplace_count, 0); atomic_set(&sbi->inplace_count, 0);
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);

11
fs/f2fs/f2fs.h
View File

@ -1257,7 +1257,6 @@ enum inode_type {
DIR_INODE, /* for dirty dir inode */ DIR_INODE, /* for dirty dir inode */
FILE_INODE, /* for dirty regular/symlink inode */ FILE_INODE, /* for dirty regular/symlink inode */
DIRTY_META, /* for all dirtied inode metadata */ DIRTY_META, /* for all dirtied inode metadata */
ATOMIC_FILE, /* for all atomic files */
NR_INODE_TYPE, NR_INODE_TYPE,
}; };
@ -1739,7 +1738,6 @@ struct f2fs_sb_info {
unsigned int gc_urgent_high_remaining; /* remaining trial count for GC_URGENT_HIGH */ unsigned int gc_urgent_high_remaining; /* remaining trial count for GC_URGENT_HIGH */
/* for skip statistic */ /* for skip statistic */
unsigned int atomic_files; /* # of opened atomic file */
unsigned long long skipped_gc_rwsem; /* FG_GC only */ unsigned long long skipped_gc_rwsem; /* FG_GC only */
/* threshold for gc trials on pinned files */ /* threshold for gc trials on pinned files */
@ -1771,6 +1769,7 @@ struct f2fs_sb_info {
atomic_t compr_inode; /* # of compressed inodes */ atomic_t compr_inode; /* # of compressed inodes */
atomic64_t compr_blocks; /* # of compressed blocks */ atomic64_t compr_blocks; /* # of compressed blocks */
atomic_t swapfile_inode; /* # of swapfile inodes */ atomic_t swapfile_inode; /* # of swapfile inodes */
atomic_t atomic_files; /* # of opened atomic file */
atomic_t max_aw_cnt; /* max # of atomic writes */ atomic_t max_aw_cnt; /* max # of atomic writes */
unsigned int io_skip_bggc; /* skip background gc for in-flight IO */ unsigned int io_skip_bggc; /* skip background gc for in-flight IO */
unsigned int other_skip_bggc; /* skip background gc for other reasons */ unsigned int other_skip_bggc; /* skip background gc for other reasons */
@ -3970,6 +3969,10 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
(atomic_inc(&F2FS_I_SB(inode)->swapfile_inode)) (atomic_inc(&F2FS_I_SB(inode)->swapfile_inode))
#define stat_dec_swapfile_inode(inode) \ #define stat_dec_swapfile_inode(inode) \
(atomic_dec(&F2FS_I_SB(inode)->swapfile_inode)) (atomic_dec(&F2FS_I_SB(inode)->swapfile_inode))
#define stat_inc_atomic_inode(inode) \
(atomic_inc(&F2FS_I_SB(inode)->atomic_files))
#define stat_dec_atomic_inode(inode) \
(atomic_dec(&F2FS_I_SB(inode)->atomic_files))
#define stat_inc_meta_count(sbi, blkaddr) \ #define stat_inc_meta_count(sbi, blkaddr) \
do { \ do { \
if (blkaddr < SIT_I(sbi)->sit_base_addr) \ if (blkaddr < SIT_I(sbi)->sit_base_addr) \
@ -3989,7 +3992,7 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
(atomic_inc(&(sbi)->inplace_count)) (atomic_inc(&(sbi)->inplace_count))
#define stat_update_max_atomic_write(inode) \ #define stat_update_max_atomic_write(inode) \
do { \ do { \
int cur = F2FS_I_SB(inode)->atomic_files; \ int cur = atomic_read(&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); \
@ -4056,6 +4059,8 @@ void f2fs_update_sit_info(struct f2fs_sb_info *sbi);
#define stat_sub_compr_blocks(inode, blocks) do { } while (0) #define stat_sub_compr_blocks(inode, blocks) do { } while (0)
#define stat_inc_swapfile_inode(inode) do { } while (0) #define stat_inc_swapfile_inode(inode) do { } while (0)
#define stat_dec_swapfile_inode(inode) do { } while (0) #define stat_dec_swapfile_inode(inode) do { } while (0)
#define stat_inc_atomic_inode(inode) do { } while (0)
#define stat_dec_atomic_inode(inode) do { } while (0)
#define stat_update_max_atomic_write(inode) do { } while (0) #define stat_update_max_atomic_write(inode) do { } while (0)
#define stat_inc_meta_count(sbi, blkaddr) do { } while (0) #define stat_inc_meta_count(sbi, blkaddr) do { } while (0)
#define stat_inc_seg_type(sbi, curseg) do { } while (0) #define stat_inc_seg_type(sbi, curseg) do { } while (0)

4
fs/f2fs/file.c
View File

@ -2051,9 +2051,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
} }
f2fs_i_size_write(fi->cow_inode, i_size_read(inode)); f2fs_i_size_write(fi->cow_inode, i_size_read(inode));
spin_lock(&sbi->inode_lock[ATOMIC_FILE]); stat_inc_atomic_inode(inode);
sbi->atomic_files++;
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
set_inode_flag(inode, FI_ATOMIC_FILE); set_inode_flag(inode, FI_ATOMIC_FILE);
set_inode_flag(fi->cow_inode, FI_COW_FILE); set_inode_flag(fi->cow_inode, FI_COW_FILE);

6
fs/f2fs/segment.c
View File

@ -187,7 +187,6 @@ bool f2fs_need_SSR(struct f2fs_sb_info *sbi)
void f2fs_abort_atomic_write(struct inode *inode, bool clean) void f2fs_abort_atomic_write(struct inode *inode, bool clean)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
struct f2fs_inode_info *fi = F2FS_I(inode); struct f2fs_inode_info *fi = F2FS_I(inode);
if (!f2fs_is_atomic_file(inode)) if (!f2fs_is_atomic_file(inode))
@ -200,10 +199,7 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)
fi->cow_inode = NULL; fi->cow_inode = NULL;
release_atomic_write_cnt(inode); release_atomic_write_cnt(inode);
clear_inode_flag(inode, FI_ATOMIC_FILE); clear_inode_flag(inode, FI_ATOMIC_FILE);
stat_dec_atomic_inode(inode);
spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
sbi->atomic_files--;
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
} }
static int __replace_atomic_write_block(struct inode *inode, pgoff_t index, static int __replace_atomic_write_block(struct inode *inode, pgoff_t index,