From: Chao Yu <yuch...@huawei.com>

This patch changes to detect synchronous writeback more earlier before,
in order to avoid unnecessary page writeback before exiting asynchronous
writeback.

Signed-off-by: Chao Yu <yuch...@huawei.com>
---
 fs/f2fs/data.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index feb4c224b305..91cbf20b448a 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1919,6 +1919,13 @@ static int f2fs_write_cache_pages(struct address_space 
*mapping,
                        struct page *page = pvec.pages[i];
                        bool submitted = false;
 
+                       /* give a priority to WB_SYNC threads */
+                       if (atomic_read(&F2FS_M_SB(mapping)->wb_sync_req) &&
+                                       wbc->sync_mode == WB_SYNC_NONE) {
+                               done = 1;
+                               break;
+                       }
+
                        done_index = page->index;
 retry_write:
                        lock_page(page);
@@ -1973,9 +1980,7 @@ static int f2fs_write_cache_pages(struct address_space 
*mapping,
                                last_idx = page->index;
                        }
 
-                       /* give a priority to WB_SYNC threads */
-                       if ((atomic_read(&F2FS_M_SB(mapping)->wb_sync_req) ||
-                                       --wbc->nr_to_write <= 0) &&
+                       if (--wbc->nr_to_write <= 0 &&
                                        wbc->sync_mode == WB_SYNC_NONE) {
                                done = 1;
                                break;
-- 
2.16.2.17.g38e79b1fd

Reply via email to