aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2018-05-03 23:26:02 -0700
committerJaegeuk Kim <jaegeuk@google.com>2018-05-07 17:03:00 -0700
commitaaae42a8cc0c37eb06deae8d81abd08badd9d9be (patch)
treed12426af8ecd674950be5e09367c96060a6d0a3e
parentdab54f3573f5b0384b8c87c91fbf1f39cde7fcb3 (diff)
UPSTREAM: f2fs: avoid fsync() failure caused by EAGAIN in writepage()ASB-2018-06-05_3.18ASB-2018-05-05_3.18
pageout() in MM traslates EAGAIN, so calls handle_write_error() -> mapping_set_error() -> set_bit(AS_EIO, ...). file_write_and_wait_range() will see EIO error, which is critical to return value of fsync() followed by atomic_write failure to user. Change-Id: I1e1048eb271a58ddcb8a3050922d9e883aa0252c Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> (cherry picked from commit 8c088f40561cb73b8226ef975e66b5285c8943df)
-rw-r--r--fs/f2fs/data.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 18233dc137ec..e2e560e52459 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1886,7 +1886,13 @@ out:
redirty_out:
redirty_page_for_writepage(wbc, page);
- if (!err)
+ /*
+ * pageout() in MM traslates EAGAIN, so calls handle_write_error()
+ * -> mapping_set_error() -> set_bit(AS_EIO, ...).
+ * file_write_and_wait_range() will see EIO error, which is critical
+ * to return value of fsync() followed by atomic_write failure to user.
+ */
+ if (!err || wbc->for_reclaim)
return AOP_WRITEPAGE_ACTIVATE;
unlock_page(page);
return err;