diff options
author | Al Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2005-08-20 00:17:39 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-19 18:08:21 -0700 |
commit | 008b150a3c4d971cd65d02d107b8fcc860bc959c (patch) | |
tree | 8594c24dbb13dc253f41ef885a8ac899f0e434c1 /fs/smbfs | |
parent | cc314eef0128a807e50fa03baf2d0abc0647952c (diff) | |
download | op-kernel-dev-008b150a3c4d971cd65d02d107b8fcc860bc959c.zip op-kernel-dev-008b150a3c4d971cd65d02d107b8fcc860bc959c.tar.gz |
[PATCH] Fix up symlink function pointers
This fixes up the symlink functions for the calling convention change:
* afs, autofs4, befs, devfs, freevxfs, jffs2, jfs, ncpfs, procfs,
smbfs, sysvfs, ufs, xfs - prototype change for ->follow_link()
* befs, smbfs, xfs - same for ->put_link()
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/smbfs')
-rw-r--r-- | fs/smbfs/symlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c index 8b069e0..0c64bc3 100644 --- a/fs/smbfs/symlink.c +++ b/fs/smbfs/symlink.c @@ -34,7 +34,7 @@ int smb_symlink(struct inode *inode, struct dentry *dentry, const char *oldname) return smb_proc_symlink(server_from_dentry(dentry), dentry, oldname); } -static int smb_follow_link(struct dentry *dentry, struct nameidata *nd) +static void *smb_follow_link(struct dentry *dentry, struct nameidata *nd) { char *link = __getname(); DEBUG1("followlink of %s/%s\n", DENTRY_PATH(dentry)); @@ -52,10 +52,10 @@ static int smb_follow_link(struct dentry *dentry, struct nameidata *nd) } } nd_set_link(nd, link); - return 0; + return NULL; } -static void smb_put_link(struct dentry *dentry, struct nameidata *nd) +static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) { char *s = nd_get_link(nd); if (!IS_ERR(s)) |