diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /fs/devpts | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'fs/devpts')
| -rw-r--r-- | fs/devpts/inode.c | 6 | ||||
| -rw-r--r-- | fs/devpts/root.c | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index b11cae5ba..56433a343 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c @@ -284,10 +284,8 @@ static void devpts_read_inode(struct inode *inode) if ( ino >= sbi->max_ptys ) return; /* Bogus */ - inode->i_mode = S_IFCHR; - inode->i_rdev = MKDEV(0,0); /* Gets filled in by devpts_pty_new() */ - - inode->i_op = &chrdev_inode_operations; + /* Gets filled in by devpts_pty_new() */ + init_special_inode(inode,S_IFCHR,0); return; } diff --git a/fs/devpts/root.c b/fs/devpts/root.c index 9b4d194f2..92978217f 100644 --- a/fs/devpts/root.c +++ b/fs/devpts/root.c @@ -25,17 +25,6 @@ static struct file_operations devpts_root_operations = { NULL, /* read */ NULL, /* write */ devpts_root_readdir, /* readdir */ - NULL, /* poll */ - NULL, /* ioctl */ - NULL, /* mmap */ - NULL, /* open */ - NULL, /* flush */ - NULL, /* release */ - NULL, /* fsync */ - NULL, /* fasync */ - NULL, /* check_media_change */ - NULL, /* revalidate */ - NULL /* lock */ }; struct inode_operations devpts_root_inode_operations = { |