Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a60d50 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7c657f2f

fs/hppfs/hppfs_kern.c

+8 −8
Original line number Diff line number Diff line
@@ -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);

		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 = {