f2fs: only flush the single temp bio cache which owns the target page

Previously, when f2fs finds which temp bio cache owns the target page,
it will flush all the three temp bio caches, but we only need to flush
one single bio cache indeed, which can help to keep bio merged.

Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index aa8843a3e5bc1520193f1ec92e398f7a49392f13..8aef1abc910afd855e4aa38d7a9f8e00cef36d71 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -372,29 +372,6 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,
        return false;
 }
 
-static bool has_merged_page(struct f2fs_sb_info *sbi, struct inode *inode,
-                                               struct page *page, nid_t ino,
-                                               enum page_type type)
-{
-       enum page_type btype = PAGE_TYPE_OF_BIO(type);
-       enum temp_type temp;
-       struct f2fs_bio_info *io;
-       bool ret = false;
-
-       for (temp = HOT; temp < NR_TEMP_TYPE; temp++) {
-               io = sbi->write_io[btype] + temp;
-
-               down_read(&io->io_rwsem);
-               ret = __has_merged_page(io, inode, page, ino);
-               up_read(&io->io_rwsem);
-
-               /* TODO: use HOT temp only for meta pages now. */
-               if (ret || btype == META)
-                       break;
-       }
-       return ret;
-}
-
 static void __f2fs_submit_merged_write(struct f2fs_sb_info *sbi,
                                enum page_type type, enum temp_type temp)
 {
@@ -420,13 +397,19 @@ static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,
                                nid_t ino, enum page_type type, bool force)
 {
        enum temp_type temp;
-
-       if (!force && !has_merged_page(sbi, inode, page, ino, type))
-               return;
+       bool ret = true;
 
        for (temp = HOT; temp < NR_TEMP_TYPE; temp++) {
+               if (!force)     {
+                       enum page_type btype = PAGE_TYPE_OF_BIO(type);
+                       struct f2fs_bio_info *io = sbi->write_io[btype] + temp;
 
-               __f2fs_submit_merged_write(sbi, type, temp);
+                       down_read(&io->io_rwsem);
+                       ret = __has_merged_page(io, inode, page, ino);
+                       up_read(&io->io_rwsem);
+               }
+               if (ret)
+                       __f2fs_submit_merged_write(sbi, type, temp);
 
                /* TODO: use HOT temp only for meta pages now. */
                if (type >= META)