Skip to content

Commit 8ec071c

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: account swapfile inodes
In order to check count of opened swapfile inodes. Signed-off-by: Chao Yu <chao.yu@oppo.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 689fe57 commit 8ec071c

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

fs/f2fs/data.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3989,6 +3989,7 @@ static int f2fs_swap_activate(struct swap_info_struct *sis, struct file *file,
39893989
if (ret < 0)
39903990
return ret;
39913991

3992+
stat_inc_swapfile_inode(inode);
39923993
set_inode_flag(inode, FI_PIN_FILE);
39933994
f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
39943995
return ret;
@@ -3998,6 +3999,7 @@ static void f2fs_swap_deactivate(struct file *file)
39983999
{
39994000
struct inode *inode = file_inode(file);
40004001

4002+
stat_dec_swapfile_inode(inode);
40014003
clear_inode_flag(inode, FI_PIN_FILE);
40024004
}
40034005
#else

fs/f2fs/debug.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ static void update_general_status(struct f2fs_sb_info *sbi)
135135
si->inline_inode = atomic_read(&sbi->inline_inode);
136136
si->inline_dir = atomic_read(&sbi->inline_dir);
137137
si->compr_inode = atomic_read(&sbi->compr_inode);
138+
si->swapfile_inode = atomic_read(&sbi->swapfile_inode);
138139
si->compr_blocks = atomic64_read(&sbi->compr_blocks);
139140
si->append = sbi->im[APPEND_INO].ino_num;
140141
si->update = sbi->im[UPDATE_INO].ino_num;
@@ -385,6 +386,8 @@ static int stat_show(struct seq_file *s, void *v)
385386
si->inline_dir);
386387
seq_printf(s, " - Compressed Inode: %u, Blocks: %llu\n",
387388
si->compr_inode, si->compr_blocks);
389+
seq_printf(s, " - Swapfile Inode: %u\n",
390+
si->swapfile_inode);
388391
seq_printf(s, " - Orphan/Append/Update Inode: %u, %u, %u\n",
389392
si->orphans, si->append, si->update);
390393
seq_printf(s, "\nMain area: %d segs, %d secs %d zones\n",
@@ -607,6 +610,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)
607610
atomic_set(&sbi->inline_dir, 0);
608611
atomic_set(&sbi->compr_inode, 0);
609612
atomic64_set(&sbi->compr_blocks, 0);
613+
atomic_set(&sbi->swapfile_inode, 0);
610614
atomic_set(&sbi->inplace_count, 0);
611615
for (i = META_CP; i < META_MAX; i++)
612616
atomic_set(&sbi->meta_count[i], 0);

fs/f2fs/f2fs.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,6 +1770,7 @@ struct f2fs_sb_info {
17701770
atomic_t inline_dir; /* # of inline_dentry inodes */
17711771
atomic_t compr_inode; /* # of compressed inodes */
17721772
atomic64_t compr_blocks; /* # of compressed blocks */
1773+
atomic_t swapfile_inode; /* # of swapfile inodes */
17731774
atomic_t max_aw_cnt; /* max # of atomic writes */
17741775
unsigned int io_skip_bggc; /* skip background gc for in-flight IO */
17751776
unsigned int other_skip_bggc; /* skip background gc for other reasons */
@@ -3876,7 +3877,7 @@ struct f2fs_stat_info {
38763877
int nr_issued_ckpt, nr_total_ckpt, nr_queued_ckpt;
38773878
unsigned int cur_ckpt_time, peak_ckpt_time;
38783879
int inline_xattr, inline_inode, inline_dir, append, update, orphans;
3879-
int compr_inode;
3880+
int compr_inode, swapfile_inode;
38803881
unsigned long long compr_blocks;
38813882
int aw_cnt, max_aw_cnt;
38823883
unsigned int valid_count, valid_node_count, valid_inode_count, discard_blks;
@@ -3965,6 +3966,10 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)
39653966
(atomic64_add(blocks, &F2FS_I_SB(inode)->compr_blocks))
39663967
#define stat_sub_compr_blocks(inode, blocks) \
39673968
(atomic64_sub(blocks, &F2FS_I_SB(inode)->compr_blocks))
3969+
#define stat_inc_swapfile_inode(inode) \
3970+
(atomic_inc(&F2FS_I_SB(inode)->swapfile_inode))
3971+
#define stat_dec_swapfile_inode(inode) \
3972+
(atomic_dec(&F2FS_I_SB(inode)->swapfile_inode))
39683973
#define stat_inc_meta_count(sbi, blkaddr) \
39693974
do { \
39703975
if (blkaddr < SIT_I(sbi)->sit_base_addr) \
@@ -4049,6 +4054,8 @@ void f2fs_update_sit_info(struct f2fs_sb_info *sbi);
40494054
#define stat_dec_compr_inode(inode) do { } while (0)
40504055
#define stat_add_compr_blocks(inode, blocks) do { } while (0)
40514056
#define stat_sub_compr_blocks(inode, blocks) do { } while (0)
4057+
#define stat_inc_swapfile_inode(inode) do { } while (0)
4058+
#define stat_dec_swapfile_inode(inode) do { } while (0)
40524059
#define stat_update_max_atomic_write(inode) do { } while (0)
40534060
#define stat_inc_meta_count(sbi, blkaddr) do { } while (0)
40544061
#define stat_inc_seg_type(sbi, curseg) do { } while (0)

0 commit comments

Comments
 (0)