---

yaml --- r: 178829 b: refs/heads/master c: 7211a4e h: refs/heads/master i: 178827: c46ae29 v: v3
git-mirror · Jan 6, 2010 · f7e157b · f7e157b
1 parent 0f99c9a
commit f7e157b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;
 }