From c5d5937a6f84db751777db6506a8f487c45e0b09 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 26 Jan 2010 15:41:53 -0500
Subject: [PATCH] --- yaml --- r: 180232 b: refs/heads/master c:
 82be934a59ff891cac598727e5a862ba2b9d1fac h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8fc26cb0efcf..36d6ace39f4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9edda7140ec6a22accf7f2f86da362dfbfd41fc
+refs/heads/master: 82be934a59ff891cac598727e5a862ba2b9d1fac
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index 6b891328f332..63f2071d6445 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -486,6 +486,8 @@ static int nfs_release_page(struct page *page, gfp_t gfp)
 {
 	dfprintk(PAGECACHE, "NFS: release_page(%p)\n", page);
 
+	if (gfp & __GFP_WAIT)
+		nfs_wb_page(page->mapping->host, page);
 	/* If PagePrivate() is set, then the page is not freeable */
 	if (PagePrivate(page))
 		return 0;