From 0581e7da0ffff961616e6b0e7605205b6cb5827c Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 19 Feb 2010 17:03:29 -0800
Subject: [PATCH] --- yaml --- r: 186168 b: refs/heads/master c:
 5cf95214ccb915591e2214f81de4659302d3e452 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/inode.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index e5b8f83e413a..ce9d1fc7ce72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f2f12d963e7c33a93bfb0b22f0178eb1e6a4196
+refs/heads/master: 5cf95214ccb915591e2214f81de4659302d3e452
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 443772df9b17..e8b41170d295 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -114,16 +114,12 @@ void nfs_clear_inode(struct inode *inode)
  */
 int nfs_sync_mapping(struct address_space *mapping)
 {
-	int ret;
+	int ret = 0;
 
-	if (mapping->nrpages == 0)
-		return 0;
-	unmap_mapping_range(mapping, 0, 0, 0);
-	ret = filemap_write_and_wait(mapping);
-	if (ret != 0)
-		goto out;
-	ret = nfs_wb_all(mapping->host);
-out:
+	if (mapping->nrpages != 0) {
+		unmap_mapping_range(mapping, 0, 0, 0);
+		ret = nfs_wb_all(mapping->host);
+	}
 	return ret;
 }