Skip to content

Commit b4dac12

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: change to use atomic_t type form sbi.atomic_files
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>
1 parent 8ec071c commit b4dac12

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

fs/f2fs/debug.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
9191
si->ndirty_files = sbi->ndirty_inode[FILE_INODE];
9292
si->nquota_files = sbi->nquota_files;
9393
si->ndirty_all = sbi->ndirty_inode[DIRTY_META];
94-
si->aw_cnt = sbi->atomic_files;
94+
si->aw_cnt = atomic_read(&sbi->atomic_files);
9595
si->max_aw_cnt = atomic_read(&sbi->max_aw_cnt);
9696
si->nr_dio_read = get_pages(sbi, F2FS_DIO_READ);
9797
si->nr_dio_write = get_pages(sbi, F2FS_DIO_WRITE);
@@ -611,6 +611,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
611611
atomic_set(&sbi->compr_inode, 0);
612612
atomic64_set(&sbi->compr_blocks, 0);
613613
atomic_set(&sbi->swapfile_inode, 0);
614+
atomic_set(&sbi->atomic_files, 0);
614615
atomic_set(&sbi->inplace_count, 0);
615616
for (i = META_CP; i < META_MAX; i++)
616617
atomic_set(&sbi->meta_count[i], 0);

fs/f2fs/f2fs.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,6 @@ enum inode_type {
12571257
DIR_INODE, /* for dirty dir inode */
12581258
FILE_INODE, /* for dirty regular/symlink inode */
12591259
DIRTY_META, /* for all dirtied inode metadata */
1260-
ATOMIC_FILE, /* for all atomic files */
12611260
NR_INODE_TYPE,
12621261
};
12631262

@@ -1739,7 +1738,6 @@ struct f2fs_sb_info {
17391738
unsigned int gc_urgent_high_remaining; /* remaining trial count for GC_URGENT_HIGH */
17401739

17411740
/* for skip statistic */
1742-
unsigned int atomic_files; /* # of opened atomic file */
17431741
unsigned long long skipped_gc_rwsem; /* FG_GC only */
17441742

17451743
/* threshold for gc trials on pinned files */
@@ -1771,6 +1769,7 @@ struct f2fs_sb_info {
17711769
atomic_t compr_inode; /* # of compressed inodes */
17721770
atomic64_t compr_blocks; /* # of compressed blocks */
17731771
atomic_t swapfile_inode; /* # of swapfile inodes */
1772+
atomic_t atomic_files; /* # of opened atomic file */
17741773
atomic_t max_aw_cnt; /* max # of atomic writes */
17751774
unsigned int io_skip_bggc; /* skip background gc for in-flight IO */
17761775
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)
39703969
(atomic_inc(&F2FS_I_SB(inode)->swapfile_inode))
39713970
#define stat_dec_swapfile_inode(inode) \
39723971
(atomic_dec(&F2FS_I_SB(inode)->swapfile_inode))
3972+
#define stat_inc_atomic_inode(inode) \
3973+
(atomic_inc(&F2FS_I_SB(inode)->atomic_files))
3974+
#define stat_dec_atomic_inode(inode) \
3975+
(atomic_dec(&F2FS_I_SB(inode)->atomic_files))
39733976
#define stat_inc_meta_count(sbi, blkaddr) \
39743977
do { \
39753978
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)
39893992
(atomic_inc(&(sbi)->inplace_count))
39903993
#define stat_update_max_atomic_write(inode) \
39913994
do { \
3992-
int cur = F2FS_I_SB(inode)->atomic_files; \
3995+
int cur = atomic_read(&F2FS_I_SB(inode)->atomic_files); \
39933996
int max = atomic_read(&F2FS_I_SB(inode)->max_aw_cnt); \
39943997
if (cur > max) \
39953998
atomic_set(&F2FS_I_SB(inode)->max_aw_cnt, cur); \
@@ -4056,6 +4059,8 @@ void f2fs_update_sit_info(struct f2fs_sb_info *sbi);
40564059
#define stat_sub_compr_blocks(inode, blocks) do { } while (0)
40574060
#define stat_inc_swapfile_inode(inode) do { } while (0)
40584061
#define stat_dec_swapfile_inode(inode) do { } while (0)
4062+
#define stat_inc_atomic_inode(inode) do { } while (0)
4063+
#define stat_dec_atomic_inode(inode) do { } while (0)
40594064
#define stat_update_max_atomic_write(inode) do { } while (0)
40604065
#define stat_inc_meta_count(sbi, blkaddr) do { } while (0)
40614066
#define stat_inc_seg_type(sbi, curseg) do { } while (0)

fs/f2fs/file.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,9 +2051,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
20512051
}
20522052
f2fs_i_size_write(fi->cow_inode, i_size_read(inode));
20532053

2054-
spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
2055-
sbi->atomic_files++;
2056-
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
2054+
stat_inc_atomic_inode(inode);
20572055

20582056
set_inode_flag(inode, FI_ATOMIC_FILE);
20592057
set_inode_flag(fi->cow_inode, FI_COW_FILE);

fs/f2fs/segment.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ bool f2fs_need_SSR(struct f2fs_sb_info *sbi)
187187

188188
void f2fs_abort_atomic_write(struct inode *inode, bool clean)
189189
{
190-
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
191190
struct f2fs_inode_info *fi = F2FS_I(inode);
192191

193192
if (!f2fs_is_atomic_file(inode))
@@ -200,10 +199,7 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean)
200199
fi->cow_inode = NULL;
201200
release_atomic_write_cnt(inode);
202201
clear_inode_flag(inode, FI_ATOMIC_FILE);
203-
204-
spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
205-
sbi->atomic_files--;
206-
spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
202+
stat_dec_atomic_inode(inode);
207203
}
208204

209205
static int __replace_atomic_write_block(struct inode *inode, pgoff_t index,

0 commit comments

Comments
 (0)