diff --git a/[refs] b/[refs]
index b0072940dc19..a02ae61fbc8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 536e43d12b9517bbbf6114cd1a12be27857a4d7a
+refs/heads/master: 2aeb98f498ce37742b743080fdc6c8cf64053599
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index c43a452f7da2..4fdaaa63cf1c 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -530,6 +530,8 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	if (mapping != dentry->d_inode->i_mapping)
 		goto out_unlock;
 
+	wait_on_page_writeback(page);
+
 	pagelen = nfs_page_length(page);
 	if (pagelen == 0)
 		goto out_unlock;