diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /fs/nfs/dir.c | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 788307cc2..82d3f5bc3 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -52,17 +52,10 @@ static int nfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *); static struct file_operations nfs_dir_operations = { - NULL, /* lseek - default */ - nfs_dir_read, /* read - bad */ - NULL, /* write - bad */ - nfs_readdir, /* readdir */ - NULL, /* select - default */ - NULL, /* ioctl - default */ - NULL, /* mmap */ - nfs_open, /* open */ - NULL, /* flush */ - nfs_release, /* release */ - NULL /* fsync */ + read: nfs_dir_read, + readdir: nfs_readdir, + open: nfs_open, + release: nfs_release, }; struct inode_operations nfs_dir_inode_operations = { @@ -78,9 +71,6 @@ struct inode_operations nfs_dir_inode_operations = { nfs_rename, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ NULL, /* truncate */ NULL, /* permission */ nfs_revalidate, /* revalidate */ |