summaryrefslogtreecommitdiffstats
path: root/fs/smbfs/dir.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
commit529c593ece216e4aaffd36bd940cb94f1fa63129 (patch)
tree78f1c0b805f5656aa7b0417a043c5346f700a2cf /fs/smbfs/dir.c
parent0bd079751d25808d1972baee5c4eaa1db2227257 (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/smbfs/dir.c')
-rw-r--r--fs/smbfs/dir.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index 37bf168f6..68351b4b4 100644
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -32,17 +32,10 @@ static int smb_rename(struct inode *, struct dentry *,
static struct file_operations smb_dir_operations =
{
- NULL, /* lseek - default */
- smb_dir_read, /* read - bad */
- NULL, /* write - bad */
- smb_readdir, /* readdir */
- NULL, /* poll - default */
- smb_ioctl, /* ioctl */
- NULL, /* mmap */
- smb_dir_open, /* open(struct inode *, struct file *) */
- NULL, /* flush */
- NULL, /* no special release code */
- NULL /* fsync */
+ read: smb_dir_read,
+ readdir: smb_readdir,
+ ioctl: smb_ioctl,
+ open: smb_dir_open,
};
struct inode_operations smb_dir_inode_operations =
@@ -59,9 +52,6 @@ struct inode_operations smb_dir_inode_operations =
smb_rename, /* rename */
NULL, /* readlink */
NULL, /* follow_link */
- NULL, /* get_block */
- NULL, /* readpage */
- NULL, /* writepage */
NULL, /* truncate */
NULL, /* permission */
smb_revalidate_inode, /* revalidate */