diff options
| author | Christoph Hellwig <hch@lst.de> | 2009-12-25 17:44:45 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-01-06 17:37:26 -0500 |
| commit | 7211a4e859ad070b28545c06e0a6cb60b3b8aa31 (patch) | |
| tree | 2a769132446f73cf593661428e68d7086168a5b2 | |
| parent | f69ac2f5a36948e1adf071074414c5d1907b89b7 (diff) | |
| download | linux-7211a4e859ad070b28545c06e0a6cb60b3b8aa31.tar.gz linux-7211a4e859ad070b28545c06e0a6cb60b3b8aa31.tar.bz2 linux-7211a4e859ad070b28545c06e0a6cb60b3b8aa31.zip | |
nfsd: make sure data is on disk before calling ->fsync
nfsd is not using vfs_fsync, so I missed it when changing the calling
convention during the 2.6.32 window. This patch fixes it to not only
start the data writeout, but also wait for it to complete before calling
into ->fsync.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index e3ef3ec0efd0..d5fe17cb07e3 100644 --- a/fs/nfsd/vfs.c +++ b/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; } |