summaryrefslogtreecommitdiffstats
path: root/fs/cifs/link.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-08-21 17:27:29 +0200
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-08-21 17:27:29 +0200
commite9dc122166b8d863d3057a66ada04838e5548e52 (patch)
tree749e15bf719b64bf9113db7acd8e043d9742cb26 /fs/cifs/link.c
parentsunrpc: fix memory leak in unix_gid cache. (diff)
parentSUNRPC: Ensure that sunrpc gets initialised before nfs, lockd, etc... (diff)
downloadlinux-e9dc122166b8d863d3057a66ada04838e5548e52.tar.xz
linux-e9dc122166b8d863d3057a66ada04838e5548e52.zip
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts: net/sunrpc/cache.c
Diffstat (limited to 'fs/cifs/link.c')
-rw-r--r--fs/cifs/link.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index cd83c53fcbb5..fc1e0487eaee 100644
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -172,8 +172,9 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
+ rc = -ENOMEM;
FreeXid(xid);
- return -ENOMEM;
+ return rc;
}
cFYI(1, ("Full path: %s", full_path));