---

yaml --- r: 348973 b: refs/heads/master c: fa9150a h: refs/heads/master i: 348971: b588c49 v: v3
git-mirror · Jan 15, 2013 · 2b1c723 · 2b1c723
1 parent 58214aa
commit 2b1c723
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 163799872b65b0cbf0091d82971233cc3d2425d3
+refs/heads/master: fa9150a84ca333f68127097c4fa1eda4b3913a22
diff --git a/trunk/fs/f2fs/data.c b/trunk/fs/f2fs/data.c
@@ -547,6 +547,15 @@ static int f2fs_write_data_page(struct page *page,
 
 #define MAX_DESIRED_PAGES_WP	4096
 
+static int __f2fs_writepage(struct page *page, struct writeback_control *wbc,
+			void *data)
+{
+	struct address_space *mapping = data;
+	int ret = mapping->a_ops->writepage(page, wbc);
+	mapping_set_error(mapping, ret);
+	return ret;
+}
+
 static int f2fs_write_data_pages(struct address_space *mapping,
 			    struct writeback_control *wbc)
 {
@@ -563,7 +572,7 @@ static int f2fs_write_data_pages(struct address_space *mapping,
 
 	if (!S_ISDIR(inode->i_mode))
 		mutex_lock(&sbi->writepages);
-	ret = generic_writepages(mapping, wbc);
+	ret = write_cache_pages(mapping, wbc, __f2fs_writepage, mapping);
 	if (!S_ISDIR(inode->i_mode))
 		mutex_unlock(&sbi->writepages);
 	f2fs_submit_bio(sbi, DATA, (wbc->sync_mode == WB_SYNC_ALL));