From 067ff29ffb88f4de40ab383882045ed98d94d96c Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 17 Jan 2012 22:04:26 -0500
Subject: [PATCH] --- yaml --- r: 294403 b: refs/heads/master c:
 2aeb98f498ce37742b743080fdc6c8cf64053599 h: refs/heads/master i:   294401:
 2b76ba76f1d317429cd1d8d3de1fd9b101bb963a   294399:
 54cbdc9ad2d57e0f084ff0f743c7bed0082cbd45 v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfs/file.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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;