X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fnfsd%2Fvfs.c;h=d5fe17cb07e3f6f7717574dbd151146a5fb25c97;hb=7211a4e859ad070b28545c06e0a6cb60b3b8aa31;hp=f6ca32b07e11e2bb9a1d1e2b192a863b95b66259;hpb=03a816b46d7eba78da11e4025f0af195b32fa464;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index f6ca32b..d5fe17c 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1,7 +1,5 @@
 #define MSNFS	/* HACK HACK */
 /*
- * linux/fs/nfsd/vfs.c
- *
  * File operations used by nfsd. Some of these have been ripped from
  * other parts of the kernel because they weren't exported, others
  * are partial duplicates with added or changed functionality.
@@ -784,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;
 }