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/nfs/file.c | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index eb4735a6d..4587950ef 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -32,13 +32,12 @@ #define NFSDBG_FACILITY NFSDBG_FILE -static int nfs_file_mmap(struct inode *, struct file *, - struct vm_area_struct *); +static int nfs_file_mmap(struct file *, struct vm_area_struct *); static long nfs_file_read(struct inode *, struct file *, char *, unsigned long); static long nfs_file_write(struct inode *, struct file *, const char *, unsigned long); static int nfs_file_close(struct inode *, struct file *); -static int nfs_fsync(struct inode *, struct file *); +static int nfs_fsync(struct file *, struct dentry *dentry); static struct file_operations nfs_file_operations = { NULL, /* lseek - default */ @@ -114,20 +113,21 @@ nfs_file_read(struct inode * inode, struct file * file, } static int -nfs_file_mmap(struct inode * inode, struct file * file, - struct vm_area_struct * vma) +nfs_file_mmap(struct file * file, struct vm_area_struct * vma) { int status; + struct inode *inode = file->f_dentry->d_inode; dfprintk(VFS, "nfs: mmap(%x/%ld)\n", inode->i_dev, inode->i_ino); if ((status = nfs_revalidate_inode(NFS_SERVER(inode), inode)) < 0) return status; - return generic_file_mmap(inode, file, vma); + return generic_file_mmap(file, vma); } -static int nfs_fsync(struct inode *inode, struct file *file) +static int nfs_fsync(struct file *file, struct dentry *dentry) { + struct inode *inode = dentry->d_inode; dfprintk(VFS, "nfs: fsync(%x/%ld)\n", inode->i_dev, inode->i_ino); return nfs_flush_dirty_pages(inode, 0, 0); @@ -175,9 +175,10 @@ nfs_file_write(struct inode *inode, struct file *file, * Lock a (portion of) a file */ int -nfs_lock(struct inode *inode, struct file *filp, int cmd, struct file_lock *fl) +nfs_lock(struct file *filp, int cmd, struct file_lock *fl) { int status; + struct inode * inode; dprintk("NFS: nfs_lock(f=%4x/%ld, t=%x, fl=%x, r=%ld:%ld)\n", filp->f_dentry->d_inode->i_dev, filp->f_dentry->d_inode->i_ino, |