---

yaml --- r: 118747 b: refs/heads/master c: 4c1bbf1 h: refs/heads/master i: 118745: ba06f07 118743: 2e972d1 v: v3
git-mirror · Nov 10, 2008 · 3f41a6c · 3f41a6c
1 parent 3b0a379
commit 3f41a6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae0dff683076b2798763288c7ac2f09a18c4a998
+refs/heads/master: 4c1bbf1ba631d7db61ce3462349a3f5d14ae3009
diff --git a/trunk/fs/ocfs2/mmap.c b/trunk/fs/ocfs2/mmap.c
@@ -113,7 +113,11 @@ static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh,
 	 * ocfs2_write_begin_nolock().
 	 */
 	if (!PageUptodate(page) || page->mapping != inode->i_mapping) {
-		ret = -EINVAL;
+		/*
+		 * the page has been umapped in ocfs2_data_downconvert_worker.
+		 * So return 0 here and let VFS retry.
+		 */
+		ret = 0;
 		goto out;
 	}