f2fs: add nat/sit entries into status

This patch adds NAT/SIT entry informations.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index dd7835b27498dc1a9fb5488c5257a66fa8c54d4d..1f0fb58072e7cfcca74045b8ab408d3e58b02c8f 100644 (file)
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -57,7 +57,9 @@ static void update_general_status(struct f2fs_sb_info *sbi)
        si->node_pages = NODE_MAPPING(sbi)->nrpages;
        si->meta_pages = META_MAPPING(sbi)->nrpages;
        si->nats = NM_I(sbi)->nat_cnt;
-       si->sits = SIT_I(sbi)->dirty_sentries;
+       si->dirty_nats = NM_I(sbi)->dirty_nat_cnt;
+       si->sits = MAIN_SEGS(sbi);
+       si->dirty_sits = SIT_I(sbi)->dirty_sentries;
        si->fnids = NM_I(sbi)->fcnt;
        si->bg_gc = sbi->bg_gc;
        si->util_free = (int)(free_user_blocks(sbi) >> sbi->log_blocks_per_seg)
@@ -260,8 +262,8 @@ static int stat_show(struct seq_file *s, void *v)
                           si->ndirty_dent, si->ndirty_dirs);
                seq_printf(s, "  - meta: %4d in %4d\n",
                           si->ndirty_meta, si->meta_pages);
-               seq_printf(s, "  - NATs: %9d\n  - SITs: %9d\n",
-                          si->nats, si->sits);
+               seq_printf(s, "  - NATs: %9d/%9d\n  - SITs: %9d/%9d\n",
+                          si->dirty_nats, si->nats, si->dirty_sits, si->sits);
                seq_printf(s, "  - free_nids: %9d\n",
                           si->fnids);
                seq_puts(s, "\nDistribution of User Blocks:");

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index ba30218770dac348eed7965b531152b43d4e34cb..209532cbee436a69c284aa17f454d569a08adc9e 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1512,7 +1512,7 @@ struct f2fs_stat_info {
        int main_area_segs, main_area_sections, main_area_zones;
        int hit_ext, total_ext;
        int ndirty_node, ndirty_dent, ndirty_dirs, ndirty_meta;
-       int nats, sits, fnids;
+       int nats, dirty_nats, sits, dirty_sits, fnids;
        int total_count, utilization;
        int bg_gc, inline_inode, inline_dir, inmem_pages;
        unsigned int valid_count, valid_node_count, valid_inode_count;