From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 20 Feb 2010 01:03:29 +0000 (-0800)
Subject: NFS: Clean up nfs_sync_mapping
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5cf95214ccb915591e2214f81de4659302d3e452;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

NFS: Clean up nfs_sync_mapping

Remove the redundant call to filemap_write_and_wait().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 443772df9b1..e8b41170d29 100644
--- a/fs/nfs/inode.c
+++ b/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;
 }