diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 04:12:23 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 04:12:23 +0200 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /fs/smbfs/symlink.c | |
| parent | [ACPI] fix ia64 build issues resulting from Lindent and merge (diff) | |
| parent | [PATCH] zd1201 kmalloc size fix (diff) | |
| download | linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.xz linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.zip | |
Merge from-linus to-akpm
Diffstat (limited to 'fs/smbfs/symlink.c')
| -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 8b069e06433d..0c64bc3a0127 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)) |