浏览代码

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>
Jaegeuk Kim 9 年之前
父节点
当前提交
c267ec1526
共有 2 个文件被更改,包括 9 次插入8 次删除
  1. 3 1
      fs/f2fs/file.c
  2. 6 7
      fs/f2fs/node.c

+ 3 - 1
fs/f2fs/file.c

@@ -256,7 +256,9 @@ go_write:
 		goto out;
 		goto out;
 	}
 	}
 sync_nodes:
 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 cp_error was enabled, we should avoid infinite loop */
 	if (unlikely(f2fs_cp_error(sbi))) {
 	if (unlikely(f2fs_cp_error(sbi))) {

+ 6 - 7
fs/f2fs/node.c

@@ -1227,7 +1227,7 @@ int fsync_node_pages(struct f2fs_sb_info *sbi, nid_t ino,
 {
 {
 	pgoff_t index, end;
 	pgoff_t index, end;
 	struct pagevec pvec;
 	struct pagevec pvec;
-	int nwritten = 0;
+	int ret = 0;
 
 
 	pagevec_init(&pvec, 0);
 	pagevec_init(&pvec, 0);
 	index = 0;
 	index = 0;
@@ -1278,21 +1278,20 @@ continue_unlock:
 			if (IS_INODE(page))
 			if (IS_INODE(page))
 				set_dentry_mark(page,
 				set_dentry_mark(page,
 						need_dentry_mark(sbi, ino));
 						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);
 				unlock_page(page);
-
-			if (--wbc->nr_to_write == 0)
 				break;
 				break;
+			}
 		}
 		}
 		pagevec_release(&pvec);
 		pagevec_release(&pvec);
 		cond_resched();
 		cond_resched();
 
 
-		if (wbc->nr_to_write == 0)
+		if (ret)
 			break;
 			break;
 	}
 	}
-	return nwritten;
+	return ret ? -EIO: 0;
 }
 }
 
 
 int sync_node_pages(struct f2fs_sb_info *sbi, struct writeback_control *wbc)
 int sync_node_pages(struct f2fs_sb_info *sbi, struct writeback_control *wbc)