---

yaml --- r: 362363 b: refs/heads/master c: f05c124 h: refs/heads/master i: 362361: 40a3b33 362359: 08f9c02 v: v3
git-mirror · Apr 5, 2013 · 4e1b1dd · 4e1b1dd
1 parent 2bdafa3
commit 4e1b1dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b1f1fd1842e6ede25183c267ae733a7f67f00bc
+refs/heads/master: f05c124a70a4953a66acbd6d6c601ea1eb5d0fa7
diff --git a/trunk/net/sunrpc/clnt.c b/trunk/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 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
 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);
 }