f2fs: submit bio of in-place-update pages

This patch tries to split in-place-update bios from sequential bios.

Suggested-by: Yunlei He <heyunlei@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b1cac6d85bcbf5fdb48aaf2cd6a4590bbf17d837..3d74c0ffa4c7541ca9245a4e995393475d507fc8 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -362,6 +362,9 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
        bio_set_op_attrs(bio, fio->op, fio->op_flags);
 
        __submit_bio(fio->sbi, bio, fio->type);
+
+       if (!is_read_io(fio->op))
+               inc_page_count(fio->sbi, WB_DATA_TYPE(fio->page));
        return 0;
 }
 
@@ -1354,7 +1357,7 @@ retry_encrypt:
                        !is_cold_data(page) &&
                        !IS_ATOMIC_WRITTEN_PAGE(page) &&
                        need_inplace_update(inode))) {
-               rewrite_data_page(fio);
+               err = rewrite_data_page(fio);
                set_inode_flag(inode, FI_UPDATE_WRITE);
                trace_f2fs_do_write_data_page(page, IPU);
        } else {

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index cca46e0ff2e4f6075139043dbcf51c4aa2349183..32821ff8483741d83a818e512dd8a40830d7b0f9 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2206,7 +2206,7 @@ void update_meta_page(struct f2fs_sb_info *sbi, void *src, block_t blk_addr);
 void write_meta_page(struct f2fs_sb_info *sbi, struct page *page);
 void write_node_page(unsigned int nid, struct f2fs_io_info *fio);
 void write_data_page(struct dnode_of_data *dn, struct f2fs_io_info *fio);
-void rewrite_data_page(struct f2fs_io_info *fio);
+int rewrite_data_page(struct f2fs_io_info *fio);
 void __f2fs_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
                        block_t old_blkaddr, block_t new_blkaddr,
                        bool recover_curseg, bool recover_newaddr);

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index b749cff59420041190b0df7472df58580dd0ac38..df5c0b3af266eae41a1ccf9656fef2e4f014612a 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1961,11 +1961,11 @@ void write_data_page(struct dnode_of_data *dn, struct f2fs_io_info *fio)
        f2fs_update_data_blkaddr(dn, fio->new_blkaddr);
 }
 
-void rewrite_data_page(struct f2fs_io_info *fio)
+int rewrite_data_page(struct f2fs_io_info *fio)
 {
        fio->new_blkaddr = fio->old_blkaddr;
        stat_inc_inplace_blocks(fio->sbi);
-       f2fs_submit_page_mbio(fio);
+       return f2fs_submit_page_bio(fio);
 }
 
 void __f2fs_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,