f2fs: fix to reorder set_page_dirty and wait_on_page_writeback

[ Upstream commit 8d64d365aed355b2e2465d19ba61df02462fff4d ]

This patch reorders flow from

- update page
- set_page_dirty
- wait_on_page_writeback

to

- wait_on_page_writeback
- update page
- set_page_dirty

The reason is:
- set_page_dirty will increase reference of dirty page, the reference
should be cleared before wait_on_page_writeback to keep its consistency.
- some devices need stable page during page writebacking, so we
should not change page's data.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 9c28ea439e0bbc5073f8314d840c75353b784903..e5719fcac47da8c500d8c56cf927df74731e92f5 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1290,11 +1290,12 @@ static void commit_checkpoint(struct f2fs_sb_info *sbi,
        struct page *page = f2fs_grab_meta_page(sbi, blk_addr);
        int err;
 
-       memcpy(page_address(page), src, PAGE_SIZE);
-       set_page_dirty(page);
-
        f2fs_wait_on_page_writeback(page, META, true);
        f2fs_bug_on(sbi, PageWriteback(page));
+
+       memcpy(page_address(page), src, PAGE_SIZE);
+
+       set_page_dirty(page);
        if (unlikely(!clear_page_dirty_for_io(page)))
                f2fs_bug_on(sbi, 1);
 

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index c96e7c6354ef3b25f733438c469f8edf74b0ae44..74f72dccab579f16225b997119dc4b31eaf7c9bf 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -812,8 +812,8 @@ static int move_data_block(struct inode *inode, block_t bidx,
        }
 
 write_page:
-       set_page_dirty(fio.encrypted_page);
        f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true);
+       set_page_dirty(fio.encrypted_page);
        if (clear_page_dirty_for_io(fio.encrypted_page))
                dec_page_count(fio.sbi, F2FS_DIRTY_META);
 
@@ -907,8 +907,9 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type,
                bool is_dirty = PageDirty(page);
 
 retry:
-               set_page_dirty(page);
                f2fs_wait_on_page_writeback(page, DATA, true);
+
+               set_page_dirty(page);
                if (clear_page_dirty_for_io(page)) {
                        inode_dec_dirty_pages(inode);
                        f2fs_remove_dirty_inode(inode);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 88be946dedd412f840637615d4f915d514714248..33fb3f8aeafa4fac516f7eb201cd50d8032f8a27 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1598,10 +1598,11 @@ int f2fs_move_node_page(struct page *node_page, int gc_type)
                        .for_reclaim = 0,
                };
 
-               set_page_dirty(node_page);
                f2fs_wait_on_page_writeback(node_page, NODE, true);
-
                f2fs_bug_on(F2FS_P_SB(node_page), PageWriteback(node_page));
+
+               set_page_dirty(node_page);
+
                if (!clear_page_dirty_for_io(node_page)) {
                        err = -EAGAIN;
                        goto out_page;

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 6edcf8391dd3da6922a5845680b0b93c4b480359..8f3578c5230eb6b75c5204a64d65a506715c4e30 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -387,8 +387,9 @@ static int __f2fs_commit_inmem_pages(struct inode *inode)
                if (page->mapping == inode->i_mapping) {
                        trace_f2fs_commit_inmem_page(page, INMEM);
 
-                       set_page_dirty(page);
                        f2fs_wait_on_page_writeback(page, DATA, true);
+
+                       set_page_dirty(page);
                        if (clear_page_dirty_for_io(page)) {
                                inode_dec_dirty_pages(inode);
                                f2fs_remove_dirty_inode(inode);