Revert "f2fs: do not skip dentry block writes"

The periodic checkpoint can resolve the previous issue.
So, now we can use this again to improve the reported performance regression:

https://lkml.org/lkml/2015/10/8/20

This reverts commit 15bec0ff5a9ba6d203178fa8772259df6207942a.

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index a903423e4cd5cdab1814f44d9924e29ae5625abb..bc04e9201fd60f9cd556eb5d2cabed724b1168dc 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1340,6 +1340,11 @@ static int f2fs_write_data_pages(struct address_space *mapping,
        if (!get_dirty_pages(inode) && wbc->sync_mode == WB_SYNC_NONE)
                return 0;
 
+       if (S_ISDIR(inode->i_mode) && wbc->sync_mode == WB_SYNC_NONE &&
+                       get_dirty_pages(inode) < nr_pages_to_skip(sbi, DATA) &&
+                       available_free_memory(sbi, DIRTY_DENTS))
+               goto skip_write;
+
        /* during POR, we don't need to trigger writepage at all. */
        if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
                goto skip_write;

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 1fe49ca2075776824c8e77424245389267203dd0..4d9bedfe101c9b843524fbbbe3edbc32f4d3eb8c 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -52,6 +52,11 @@ bool available_free_memory(struct f2fs_sb_info *sbi, int type)
                mem_size = (nm_i->nat_cnt * sizeof(struct nat_entry)) >>
                                                        PAGE_CACHE_SHIFT;
                res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 2);
+       } else if (type == DIRTY_DENTS) {
+               if (sbi->sb->s_bdi->wb.dirty_exceeded)
+                       return false;
+               mem_size = get_pages(sbi, F2FS_DIRTY_DENTS);
+               res = mem_size < ((avail_ram * nm_i->ram_thresh / 100) >> 1);
        } else if (type == INO_ENTRIES) {
                int i;
 

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 51c62edf2e893a4d968f4a23521420ad5c56bf05..7427e956ad81431be9e890354b7535d9a366575e 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -118,6 +118,7 @@ static inline void raw_nat_from_node_info(struct f2fs_nat_entry *raw_ne,
 enum mem_type {
        FREE_NIDS,      /* indicates the free nid list */
        NAT_ENTRIES,    /* indicates the cached nat entry */
+       DIRTY_DENTS,    /* indicates dirty dentry pages */
        INO_ENTRIES,    /* indicates inode entries */
        EXTENT_CACHE,   /* indicates extent cache */
        BASE_CHECK,     /* check kernel status */

diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index e9afb5884312f97db6f67964c71b13a5816b902c..ee44d346ea44143e5610c59c3d0ed66c88526c43 100644 (file)
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -699,7 +699,9 @@ static inline int nr_pages_to_skip(struct f2fs_sb_info *sbi, int type)
        if (sbi->sb->s_bdi->wb.dirty_exceeded)
                return 0;
 
-       if (type == NODE)
+       if (type == DATA)
+               return sbi->blocks_per_seg;
+       else if (type == NODE)
                return 3 * sbi->blocks_per_seg;
        else if (type == META)
                return MAX_BIO_BLOCKS(sbi);