summaryrefslogtreecommitdiffstats
path: root/fs/devpts
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/devpts
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/devpts')
-rw-r--r--fs/devpts/root.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/fs/devpts/root.c b/fs/devpts/root.c
index 92978217f..5af3967e2 100644
--- a/fs/devpts/root.c
+++ b/fs/devpts/root.c
@@ -21,31 +21,13 @@ static struct dentry *devpts_root_lookup(struct inode *,struct dentry *);
static int devpts_revalidate(struct dentry *, int);
static struct file_operations devpts_root_operations = {
- NULL, /* llseek */
- NULL, /* read */
- NULL, /* write */
- devpts_root_readdir, /* readdir */
+ readdir: devpts_root_readdir,
};
struct inode_operations devpts_root_inode_operations = {
&devpts_root_operations, /* file operations */
NULL, /* create */
devpts_root_lookup, /* lookup */
- NULL, /* link */
- NULL, /* unlink */
- NULL, /* symlink */
- NULL, /* mkdir */
- NULL, /* rmdir */
- NULL, /* mknod */
- NULL, /* rename */
- NULL, /* readlink */
- NULL, /* follow_link */
- NULL, /* get_block */
- NULL, /* readpage */
- NULL, /* writepage */
- NULL, /* truncate */
- NULL, /* permission */
- NULL /* revalidate */
};
static struct dentry_operations devpts_dentry_operations = {