summaryrefslogtreecommitdiff
path: root/net/sunrpc
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-04-23 15:52:14 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-04-23 15:52:14 -0400
commitb0212b84fb19cf89305ab96c73abdf3a76d05ef8 (patch)
tree429daec3f580ad8f4c39e90f212d259b19ba9394 /net/sunrpc
parentbd1d421abcaae1b84ba377ea4c33bba31d654199 (diff)
parenteb04e0ac198cec3bab407ad220438dfa65c19c67 (diff)
downloadlinux-3.10-b0212b84fb19cf89305ab96c73abdf3a76d05ef8.tar.gz
linux-3.10-b0212b84fb19cf89305ab96c73abdf3a76d05ef8.tar.bz2
linux-3.10-b0212b84fb19cf89305ab96c73abdf3a76d05ef8.zip
Merge branch 'bugfixes' into linux-next
Fix up a conflict between the linux-next branch and mainline. Conflicts: fs/nfs/nfs4proc.c
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/clnt.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 651245aa829..d259fa96692 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -304,10 +304,8 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
err = rpciod_up();
if (err)
goto out_no_rpciod;
- err = -EINVAL;
- if (!xprt)
- goto out_no_xprt;
+ err = -EINVAL;
if (args->version >= program->nrvers)
goto out_err;
version = program->version[args->version];
@@ -382,10 +380,9 @@ out_no_principal:
out_no_stats:
kfree(clnt);
out_err:
- xprt_put(xprt);
-out_no_xprt:
rpciod_down();
out_no_rpciod:
+ xprt_put(xprt);
return ERR_PTR(err);
}
@@ -514,7 +511,7 @@ static struct rpc_clnt *__rpc_clone_client(struct rpc_create_args *args,
new = rpc_new_client(args, xprt);
if (IS_ERR(new)) {
err = PTR_ERR(new);
- goto out_put;
+ goto out_err;
}
atomic_inc(&clnt->cl_count);
@@ -527,8 +524,6 @@ static struct rpc_clnt *__rpc_clone_client(struct rpc_create_args *args,
new->cl_chatty = clnt->cl_chatty;
return new;
-out_put:
- xprt_put(xprt);
out_err:
dprintk("RPC: %s: returned error %d\n", __func__, err);
return ERR_PTR(err);