From f7e157be50f8d5f7fe7f4b52831a7b5be42e26c2 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 25 Dec 2009 17:44:45 +0100
Subject: [PATCH] --- yaml --- r: 178829 b: refs/heads/master c:
 7211a4e859ad070b28545c06e0a6cb60b3b8aa31 h: refs/heads/master i:   178827:
 c46ae298fbd68455004fa13338b49c815bc25e65 v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfsd/vfs.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7eb533980a9b..c364e923d435 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f69ac2f5a36948e1adf071074414c5d1907b89b7
+refs/heads/master: 7211a4e859ad070b28545c06e0a6cb60b3b8aa31
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/fs/nfsd/vfs.c
index e3ef3ec0efd0..d5fe17cb07e3 100644
--- a/trunk/fs/nfsd/vfs.c
+++ b/trunk/fs/nfsd/vfs.c
@@ -782,12 +782,9 @@ static inline int nfsd_dosync(struct file *filp, struct dentry *dp,
 	int (*fsync) (struct file *, struct dentry *, int);
 	int err;
 
-	err = filemap_fdatawrite(inode->i_mapping);
+	err = filemap_write_and_wait(inode->i_mapping);
 	if (err == 0 && fop && (fsync = fop->fsync))
 		err = fsync(filp, dp, 0);
-	if (err == 0)
-		err = filemap_fdatawait(inode->i_mapping);
-
 	return err;
 }