]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] Fixup symlink function pointers for hppfs [for 2.6.13]
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Fri, 26 Aug 2005 14:57:44 +0000 (16:57 +0200)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 Aug 2005 18:39:19 +0000 (11:39 -0700)
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>
fs/hppfs/hppfs_kern.c

index ff150fedb98150882dabf0b1b0af844bfe016cc7..385d440fa23424c00ed0f49a6a7ee45bee03a54f 100644 (file)
@@ -679,25 +679,25 @@ static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
        return(n);
 }
 
-static int hppfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void* hppfs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
        struct file *proc_file;
        struct dentry *proc_dentry;
-       int (*follow_link)(struct dentry *, struct nameidata *);
-       int err, n;
+       void * (*follow_link)(struct dentry *, struct nameidata *);
+       void *ret;
 
        proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
        proc_file = dentry_open(dget(proc_dentry), NULL, O_RDONLY);
-       err = PTR_ERR(proc_dentry);
-       if(IS_ERR(proc_dentry))
-               return(err);
+
+       if (IS_ERR(proc_dentry))
+               return proc_dentry;
 
        follow_link = proc_dentry->d_inode->i_op->follow_link;
-       n = (*follow_link)(proc_dentry, nd);
+       ret = (*follow_link)(proc_dentry, nd);
 
        fput(proc_file);
 
-       return(n);
+       return ret;
 }
 
 static struct inode_operations hppfs_dir_iops = {