diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:31:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:31:42 -0700 |
| commit | b04cde34cf1d006dfaf8523640f3a18bbb15ebaa (patch) | |
| tree | a811f7a6db0de11f6c412548dfe081a57aba0451 /fs/nfs/file.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| parent | NFSv4: Fix an rpc_cred reference leakage in fs/nfs/delegation.c (diff) | |
| download | linux-dev-b04cde34cf1d006dfaf8523640f3a18bbb15ebaa.tar.xz linux-dev-b04cde34cf1d006dfaf8523640f3a18bbb15ebaa.zip | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
NFSv4: Fix an rpc_cred reference leakage in fs/nfs/delegation.c
NFSv4: Ensure that we wait for the CLOSE request to complete
NFS: Fix a race in sillyrename
NFS: Fix a writeback race...
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index d29f90d00aa2..b3bb89f7d5d2 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -131,7 +131,7 @@ nfs_file_release(struct inode *inode, struct file *filp) { /* Ensure that dirty pages are flushed out with the right creds */ if (filp->f_mode & FMODE_WRITE) - filemap_fdatawrite(filp->f_mapping); + nfs_wb_all(filp->f_path.dentry->d_inode); nfs_inc_stats(inode, NFSIOS_VFSRELEASE); return NFS_PROTO(inode)->file_release(inode, filp); } |