diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
| commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
| tree | 217f87a997699505e0dd752931409b9f10fffe65 /fs/nfsd/vfs.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'fs/nfsd/vfs.c')
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index dbbfbc78f..df6eb0e2c 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -294,7 +294,7 @@ nfsd_close(struct file *filp) void nfsd_sync(struct inode *inode, struct file *filp) { - filp->f_op->fsync(inode, filp); + filp->f_op->fsync(filp, filp->f_dentry); } /* @@ -928,7 +928,8 @@ nfsd_readdir(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, file.f_inode->i_dev, file.f_inode->i_ino, (int) file.f_pos, (int) oldlen, (int) cd.buflen); */ - err = file.f_op->readdir(&file, &cd, (filldir_t) func); + err = file.f_op->readdir(&file, + &cd, (filldir_t) func); if (err < 0) { nfsd_close(&file); |