summaryrefslogtreecommitdiffstats
path: root/fs/autofs/root.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/autofs/root.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/autofs/root.c')
-rw-r--r--fs/autofs/root.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 46fc4503e..e2c03ff34 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -24,12 +24,8 @@ static int autofs_root_mkdir(struct inode *,struct dentry *,int);
static int autofs_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long);
static struct file_operations autofs_root_operations = {
- NULL, /* llseek */
- NULL, /* read */
- NULL, /* write */
- autofs_root_readdir, /* readdir */
- NULL, /* poll */
- autofs_root_ioctl, /* ioctl */
+ readdir: autofs_root_readdir,
+ ioctl: autofs_root_ioctl,
};
struct inode_operations autofs_root_inode_operations = {
@@ -41,16 +37,6 @@ struct inode_operations autofs_root_inode_operations = {
autofs_root_symlink, /* symlink */
autofs_root_mkdir, /* mkdir */
autofs_root_rmdir, /* rmdir */
- NULL, /* mknod */
- NULL, /* rename */
- NULL, /* readlink */
- NULL, /* follow_link */
- NULL, /* get_block */
- NULL, /* readpage */
- NULL, /* writepage */
- NULL, /* truncate */
- NULL, /* permission */
- NULL /* revalidate */
};
static int autofs_root_readdir(struct file *filp, void *dirent, filldir_t filldir)