summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-22 08:54:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-22 08:54:15 -0800
commite25ba0ce039d1c5cae0b0057e4b9e228dc6744bd (patch)
tree3f5d705161f24c6a9dc36c1947ce7f81e53db41b /net
parentaf36d15f58a3560617f1497ae011c3192049e40e (diff)
parent62e4a76987eab2b7fa952546614bc83e5bfc9d3e (diff)
downloadlinux-stable-e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd.tar.gz
linux-stable-e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd.tar.bz2
linux-stable-e25ba0ce039d1c5cae0b0057e4b9e228dc6744bd.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFS: Revert pnfs ugliness from the generic NFS read code path SUNRPC: destroy freshly allocated transport in case of sockaddr init error NFS: Fix a regression in the referral code nfs: move nfs_file_operations declaration to bottom of file.c (try #2) nfs: when attempting to open a directory, fall back on normal lookup (try #5)
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtsock.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index d7f97ef26590..2d78d95955ab 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2530,8 +2530,10 @@ static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
int err;
err = xs_init_anyaddr(args->dstaddr->sa_family,
(struct sockaddr *)&new->srcaddr);
- if (err != 0)
+ if (err != 0) {
+ xprt_free(xprt);
return ERR_PTR(err);
+ }
}
return xprt;