diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 13:48:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 13:48:24 -0400 |
| commit | 3be542d464c9abdfa50ecd276a7f14906cc09107 (patch) | |
| tree | 136dba4d622746849b3679b3ed29fd6021800ff2 /net/sunrpc | |
| parent | 90290c4ebe5c64ee34fea0d2cc3025cb934917b8 (diff) | |
| parent | b4a2cf76ab7c08628c62b2062dacefa496b59dfd (diff) | |
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/sunrpc')
| -rw-r--r-- | net/sunrpc/clnt.c | 1 |
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, | |||
| 309 | return 0; | 309 | return 0; |
| 310 | err_auth: | 310 | err_auth: |
| 311 | pipefs_sb = rpc_get_sb_net(net); | 311 | pipefs_sb = rpc_get_sb_net(net); |
| 312 | rpc_unregister_client(clnt); | ||
| 312 | __rpc_clnt_remove_pipedir(clnt); | 313 | __rpc_clnt_remove_pipedir(clnt); |
| 313 | out: | 314 | out: |
| 314 | if (pipefs_sb) | 315 | if (pipefs_sb) |