From 4e1b1dda43759a22ebd23c4c1aec9f14b7b04703 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 5 Apr 2013 14:13:21 -0400
Subject: [PATCH] --- yaml --- r: 362363 b: refs/heads/master c:
 f05c124a70a4953a66acbd6d6c601ea1eb5d0fa7 h: refs/heads/master i:   362361:
 40a3b3357f938fb045ff760099c9ec972b4f149e   362359:
 08f9c02cd50911931fa49acd3b00b13ec6135149 v: v3

---
 [refs]                  | 2 +-
 trunk/net/sunrpc/clnt.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d510b1ea9658..60a2fd5ebe1b 100644
--- 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
index 9df26b785dc7..d5f35f15af98 100644
--- 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);
 }