summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 18:10:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 18:10:15 -0800
commit93939f4e5df30e6229a0b5257fdcaf3faf88471c (patch)
treef30acb3e4a35ea96b342f3b1dd25700e7b531def /fs
parentb1c0ec8966fa79891b796f58bf2bda1026ca5566 (diff)
parentb292cf9ce70d221c3f04ff62db5ab13d9a249ca8 (diff)
downloadlinux-93939f4e5df30e6229a0b5257fdcaf3faf88471c.tar.gz
linux-93939f4e5df30e6229a0b5257fdcaf3faf88471c.tar.bz2
linux-93939f4e5df30e6229a0b5257fdcaf3faf88471c.zip
Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux: sunrpc: fix peername failed on closed listener nfsd: make sure data is on disk before calling ->fsync nfsd: fix "insecure" export option
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/vfs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 7c2e337d05af..c194793b642b 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -780,12 +780,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;
}