From c267ec1526da2d3b12c80a89ebd8eb9b6a01d636 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Fri, 15 Apr 2016 09:25:04 -0700
Subject: [PATCH] f2fs: report unwritten status in fsync_node_pages
The fsync_node_pages should return pass or failure so that user could know
fsync is completed or not.
Acked-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/file.c | 4 +++-
fs/f2fs/node.c | 13 ++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 3d53ee058aae9..60fd64c59cce4 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -256,7 +256,9 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
goto out;
}
sync_nodes:
- fsync_node_pages(sbi, ino, &wbc);
+ ret = fsync_node_pages(sbi, ino, &wbc);
+ if (ret)
+ goto out;
/* if cp_error was enabled, we should avoid infinite loop */
if (unlikely(f2fs_cp_error(sbi))) {
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 675b7304c02a3..8a1e21144ecbe 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1227,7 +1227,7 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, nid_t ino,
{
pgoff_t index, end;
struct pagevec pvec;
- int nwritten = 0;
+ int ret = 0;
pagevec_init(&pvec, 0);
index = 0;
@@ -1278,21 +1278,20 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, nid_t ino,
if (IS_INODE(page))
set_dentry_mark(page,
need_dentry_mark(sbi, ino));
- nwritten++;
- if (NODE_MAPPING(sbi)->a_ops->writepage(page, wbc))
+ ret = NODE_MAPPING(sbi)->a_ops->writepage(page, wbc);
+ if (ret) {
unlock_page(page);
-
- if (--wbc->nr_to_write == 0)
break;
+ }
}
pagevec_release(&pvec);
cond_resched();
- if (wbc->nr_to_write == 0)
+ if (ret)
break;
}
- return nwritten;
+ return ret ? -EIO: 0;
}
int sync_node_pages(struct f2fs_sb_info *sbi, struct writeback_control *wbc)
--
GitLab