summaryrefslogtreecommitdiffstats
path: root/fs/nfs/symlink.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-09-12 01:29:55 +0000
commit545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch)
treee9ce4bc598d06374bda906f18365984bf22a526a /fs/nfs/symlink.c
parent4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff)
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'fs/nfs/symlink.c')
-rw-r--r--fs/nfs/symlink.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c
index 3d545f7d8..c739ebe6d 100644
--- a/fs/nfs/symlink.c
+++ b/fs/nfs/symlink.c
@@ -61,8 +61,8 @@ static int nfs_readlink(struct inode *inode, char *buffer, int buflen)
copy_to_user(buffer, res, len);
put_user('\0', buffer + len);
error = len;
+ kfree(mem);
}
- kfree(mem);
return error;
}
@@ -81,7 +81,6 @@ static struct dentry * nfs_follow_link(struct inode * inode, struct dentry *base
if (error) {
dput(base);
- kfree(mem);
return ERR_PTR(error);
}
path = kmalloc(len + 1, GFP_KERNEL);