diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2013-03-22 12:52:59 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-04-05 16:58:14 -0400 |
commit | a58e0be6f6b3eb2079b0b8fedc9df6fa86869f1e (patch) | |
tree | f5eb065a6b62e403e0487698dbcc6a6b636d1b63 /net/sunrpc | |
parent | 1166fde6a923c30f4351515b6a9a1efc513e7d00 (diff) |
SUNRPC: Remove extra xprt_put()
While testing error cases where rpc_new_client() fails, I saw
some oopses.
If rpc_new_client() fails, it already invokes xprt_put(). Thus
__rpc_clone_client() does not need to invoke it again.
Introduced by commit 1b63a751 "SUNRPC: Refactor rpc_clone_client()"
Fri Sep 14, 2012.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: stable@vger.kernel.org [>=3.7]
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/clnt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index dcc446e7fbf6..9df26b785dc7 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -512,7 +512,7 @@ static struct rpc_clnt *__rpc_clone_client(struct rpc_create_args *args, | |||
512 | new = rpc_new_client(args, xprt); | 512 | new = rpc_new_client(args, xprt); |
513 | if (IS_ERR(new)) { | 513 | if (IS_ERR(new)) { |
514 | err = PTR_ERR(new); | 514 | err = PTR_ERR(new); |
515 | goto out_put; | 515 | goto out_err; |
516 | } | 516 | } |
517 | 517 | ||
518 | atomic_inc(&clnt->cl_count); | 518 | atomic_inc(&clnt->cl_count); |
@@ -525,8 +525,6 @@ static struct rpc_clnt *__rpc_clone_client(struct rpc_create_args *args, | |||
525 | new->cl_chatty = clnt->cl_chatty; | 525 | new->cl_chatty = clnt->cl_chatty; |
526 | return new; | 526 | return new; |
527 | 527 | ||
528 | out_put: | ||
529 | xprt_put(xprt); | ||
530 | out_err: | 528 | out_err: |
531 | dprintk("RPC: %s: returned error %d\n", __func__, err); | 529 | dprintk("RPC: %s: returned error %d\n", __func__, err); |
532 | return ERR_PTR(err); | 530 | return ERR_PTR(err); |