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

We should use AOP_WRITEPAGE_ACTIVATE when we bypass writing pages.

Signed-off-by: Chao Yu <yuch...@huawei.com>
Signed-off-by: Miao Xie <miao...@huawei.com>
Signed-off-by: Jaegeuk Kim <jaeg...@kernel.org>
---
 fs/f2fs/data.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 8c5b63bda68b..b90fb010a991 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1384,6 +1384,8 @@ static int f2fs_write_data_page(struct page *page,
 
 redirty_out:
        redirty_page_for_writepage(wbc, page);
+       if (!err)
+               return AOP_WRITEPAGE_ACTIVATE;
        unlock_page(page);
        return err;
 }
@@ -1479,6 +1481,15 @@ static int f2fs_write_cache_pages(struct address_space 
*mapping,
 
                        ret = mapping->a_ops->writepage(page, wbc);
                        if (unlikely(ret)) {
+                               /*
+                                * keep nr_to_write, since vfs uses this to
+                                * get # of written pages.
+                                */
+                               if (ret == AOP_WRITEPAGE_ACTIVATE) {
+                                       unlock_page(page);
+                                       ret = 0;
+                                       continue;
+                               }
                                done_index = page->index + 1;
                                done = 1;
                                break;
-- 
2.11.0

Reply via email to