summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-20 19:48:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-20 19:48:24 +0200
commit3be542d464c9abdfa50ecd276a7f14906cc09107 (patch)
tree136dba4d622746849b3679b3ed29fd6021800ff2 /net
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jos... (diff)
parentNFSv4: Fix a regression against the FreeBSD server (diff)
downloadlinux-3be542d464c9abdfa50ecd276a7f14906cc09107.tar.xz
linux-3be542d464c9abdfa50ecd276a7f14906cc09107.zip
Merge tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust: - Fix a regression against NFSv4 FreeBSD servers when creating a new file - Fix another regression in rpc_client_register() * tag 'nfs-for-3.11-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: NFSv4: Fix a regression against the FreeBSD server SUNRPC: Fix another issue with rpc_client_register()
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/clnt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 9963584605c0..74f6a704e374 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -309,6 +309,7 @@ static int rpc_client_register(const struct rpc_create_args *args,
return 0;
err_auth:
pipefs_sb = rpc_get_sb_net(net);
+ rpc_unregister_client(clnt);
__rpc_clnt_remove_pipedir(clnt);
out:
if (pipefs_sb)