diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/autofs/inode.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/autofs/inode.c')
| -rw-r--r-- | fs/autofs/inode.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c index 77844cf0e..a67ca9822 100644 --- a/fs/autofs/inode.c +++ b/fs/autofs/inode.c @@ -60,15 +60,12 @@ static void autofs_read_inode(struct inode *inode); static void autofs_write_inode(struct inode *inode); static struct super_operations autofs_sops = { - autofs_read_inode, - autofs_write_inode, - autofs_put_inode, - autofs_delete_inode, - NULL, /* notify_change */ - autofs_put_super, - NULL, /* write_super */ - autofs_statfs, - NULL + read_inode: autofs_read_inode, + write_inode: autofs_write_inode, + put_inode: autofs_put_inode, + delete_inode: autofs_delete_inode, + put_super: autofs_put_super, + statfs: autofs_statfs, }; static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid_t *pgrp, int *minproto, int *maxproto) @@ -300,8 +297,8 @@ static void autofs_read_inode(struct inode *inode) /* Initialize to the default case (stub directory) */ - inode->i_op = NULL; inode->i_op = &autofs_dir_inode_operations; + inode->i_fop = &autofs_dir_operations; inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO; inode->i_nlink = 2; inode->i_size = 0; @@ -312,6 +309,7 @@ static void autofs_read_inode(struct inode *inode) if ( ino == AUTOFS_ROOT_INO ) { inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; inode->i_op = &autofs_root_inode_operations; + inode->i_fop = &autofs_root_operations; inode->i_uid = inode->i_gid = 0; /* Changed in read_super */ return; } |