diff options
| author | Chao Yu <yuchao0@huawei.com> | 2016-11-28 19:13:43 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@google.com> | 2017-09-25 15:37:00 -0700 |
| commit | 9a82dd23e414b084ed191d8506b99cb85f401028 (patch) | |
| tree | 42b565258157c4302c8fc704fdc89519f9174e70 | |
| parent | 9f495d826bf3dc4894f3cb4ef61af77102a38d9a (diff) | |
f2fs: return AOP_WRITEPAGE_ACTIVATE for writepage
commit 0002b61bdaac732bcff364a18f5bd57c95def0a5 upstream.
We should use AOP_WRITEPAGE_ACTIVATE when we bypass writing pages.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Miao Xie <miaoxie@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/data.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index fa254daac970..283fc9de4762 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1376,6 +1376,8 @@ out: redirty_out: redirty_page_for_writepage(wbc, page); + if (!err) + return AOP_WRITEPAGE_ACTIVATE; unlock_page(page); return err; } @@ -1471,6 +1473,15 @@ continue_unlock: 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; |