diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-08-26 10:57:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-26 14:39:19 -0400 |
commit | d7a60d50d7713b65a3fd88f11d5717b83a6b6a97 (patch) | |
tree | 80a3d59724cc0faf0a5cb07f7e426c9f41d87e67 | |
parent | 7c657f2f25d50c602df9291bc6242b98fc090759 (diff) |
[PATCH] Fixup symlink function pointers for hppfs [for 2.6.13]
Update hppfs for the symlink functions prototype change.
Yes, I know the code I leave there is still _bogus_, see next patch for
this.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/hppfs/hppfs_kern.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index ff150fedb981..385d440fa234 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c | |||
@@ -679,25 +679,25 @@ static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen) | |||
679 | return(n); | 679 | return(n); |
680 | } | 680 | } |
681 | 681 | ||
682 | static int hppfs_follow_link(struct dentry *dentry, struct nameidata *nd) | 682 | static void* hppfs_follow_link(struct dentry *dentry, struct nameidata *nd) |
683 | { | 683 | { |
684 | struct file *proc_file; | 684 | struct file *proc_file; |
685 | struct dentry *proc_dentry; | 685 | struct dentry *proc_dentry; |
686 | int (*follow_link)(struct dentry *, struct nameidata *); | 686 | void * (*follow_link)(struct dentry *, struct nameidata *); |
687 | int err, n; | 687 | void *ret; |
688 | 688 | ||
689 | proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry; | 689 | proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry; |
690 | proc_file = dentry_open(dget(proc_dentry), NULL, O_RDONLY); | 690 | proc_file = dentry_open(dget(proc_dentry), NULL, O_RDONLY); |
691 | err = PTR_ERR(proc_dentry); | 691 | |
692 | if(IS_ERR(proc_dentry)) | 692 | if (IS_ERR(proc_dentry)) |
693 | return(err); | 693 | return proc_dentry; |
694 | 694 | ||
695 | follow_link = proc_dentry->d_inode->i_op->follow_link; | 695 | follow_link = proc_dentry->d_inode->i_op->follow_link; |
696 | n = (*follow_link)(proc_dentry, nd); | 696 | ret = (*follow_link)(proc_dentry, nd); |
697 | 697 | ||
698 | fput(proc_file); | 698 | fput(proc_file); |
699 | 699 | ||
700 | return(n); | 700 | return ret; |
701 | } | 701 | } |
702 | 702 | ||
703 | static struct inode_operations hppfs_dir_iops = { | 703 | static struct inode_operations hppfs_dir_iops = { |