diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /fs/proc/proc_devtree.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/proc/proc_devtree.c')
| -rw-r--r-- | fs/proc/proc_devtree.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c index c53a440fe..cd4aca324 100644 --- a/fs/proc/proc_devtree.c +++ b/fs/proc/proc_devtree.c @@ -42,7 +42,7 @@ static int property_read_proc(char *page, char **start, off_t off, */ static int devtree_readlink(struct dentry *, char *, int); -static struct dentry *devtree_follow_link(struct dentry *, struct dentry *); +static struct dentry *devtree_follow_link(struct dentry *, struct dentry *, unsigned int); struct inode_operations devtree_symlink_inode_operations = { NULL, /* no file-operations */ @@ -66,7 +66,8 @@ struct inode_operations devtree_symlink_inode_operations = { }; static struct dentry *devtree_follow_link(struct dentry *dentry, - struct dentry *base) + struct dentry *base, + unsigned int follow) { struct inode *inode = dentry->d_inode; struct proc_dir_entry * de; @@ -74,7 +75,7 @@ static struct dentry *devtree_follow_link(struct dentry *dentry, de = (struct proc_dir_entry *) inode->u.generic_ip; link = (char *) de->data; - return lookup_dentry(link, base, 1); + return lookup_dentry(link, base, follow); } static int devtree_readlink(struct dentry *dentry, char *buffer, int buflen) |