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/devpts | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/devpts')
| -rw-r--r-- | fs/devpts/devpts_i.h | 2 | ||||
| -rw-r--r-- | fs/devpts/inode.c | 16 | ||||
| -rw-r--r-- | fs/devpts/root.c | 7 |
3 files changed, 9 insertions, 16 deletions
diff --git a/fs/devpts/devpts_i.h b/fs/devpts/devpts_i.h index fd6f71e0d..7dcd8cfd2 100644 --- a/fs/devpts/devpts_i.h +++ b/fs/devpts/devpts_i.h @@ -40,4 +40,4 @@ extern inline struct devpts_sb_info *SBI(struct super_block *sb) } extern struct inode_operations devpts_root_inode_operations; -extern struct inode_operations devpts_device_inode_operations; +extern struct file_operations devpts_root_operations; diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 56433a343..dab1864cb 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -62,16 +62,10 @@ static void devpts_read_inode(struct inode *inode); static void devpts_write_inode(struct inode *inode); static struct super_operations devpts_sops = { - devpts_read_inode, - devpts_write_inode, - NULL, /* put_inode */ - NULL, /* delete_inode */ - NULL, /* notify_change */ - devpts_put_super, - NULL, /* write_super */ - devpts_statfs, - NULL, /* remount_fs */ - NULL, /* clear_inode */ + read_inode: devpts_read_inode, + write_inode: devpts_write_inode, + put_super: devpts_put_super, + statfs: devpts_statfs, }; static int devpts_parse_options(char *options, struct devpts_sb_info *sbi) @@ -264,7 +258,6 @@ static void devpts_read_inode(struct inode *inode) ino_t ino = inode->i_ino; struct devpts_sb_info *sbi = SBI(inode->i_sb); - inode->i_op = NULL; inode->i_mode = 0; inode->i_nlink = 0; inode->i_size = 0; @@ -276,6 +269,7 @@ static void devpts_read_inode(struct inode *inode) if ( ino == 1 ) { inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; inode->i_op = &devpts_root_inode_operations; + inode->i_fop = &devpts_root_operations; inode->i_nlink = 2; return; } diff --git a/fs/devpts/root.c b/fs/devpts/root.c index 5af3967e2..ed6258663 100644 --- a/fs/devpts/root.c +++ b/fs/devpts/root.c @@ -20,14 +20,13 @@ static int devpts_root_readdir(struct file *,void *,filldir_t); static struct dentry *devpts_root_lookup(struct inode *,struct dentry *); static int devpts_revalidate(struct dentry *, int); -static struct file_operations devpts_root_operations = { +struct file_operations devpts_root_operations = { + read: generic_read_dir, readdir: devpts_root_readdir, }; struct inode_operations devpts_root_inode_operations = { - &devpts_root_operations, /* file operations */ - NULL, /* create */ - devpts_root_lookup, /* lookup */ + lookup: devpts_root_lookup, }; static struct dentry_operations devpts_dentry_operations = { |