[PATCH] RPC: Make rpc_create_client() destroy the transport on failure.

 This saves us a couple of lines of cleanup code for each call.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 3 insertions, 6 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 52707c5ad6ea..90a62f27914c 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -193,10 +193,8 @@ nlm_bind_host(struct nlm_host *host)
                 /* Existing NLM servers accept AUTH_UNIX only */
                 clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
                                         host->h_version, RPC_AUTH_UNIX);
-                if (IS_ERR(clnt)) {
-                        xprt_destroy(xprt);
+                if (IS_ERR(clnt))
                         goto forgetit;
-                }
                 clnt->cl_autobind = 1;  /* turn on pmap queries */
                 xprt->nocong = 1;       /* No congestion control for NLM */
                 xprt->resvport = 1;     /* NLM requires a reserved port */
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 6fc1bebeec1d..81b5e7778d70 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -120,15 +120,14 @@ nsm_create(void)
                                 &nsm_program, SM_VERSION,
                                 RPC_AUTH_NULL);
         if (IS_ERR(clnt))
-                goto out_destroy;
+                goto out_err;
         clnt->cl_softrtry = 1;
         clnt->cl_chatty   = 1;
         clnt->cl_oneshot  = 1;
         xprt->resvport = 1;     /* NSM requires a reserved port */
         return clnt;
 
-out_destroy:
-        xprt_destroy(xprt);
+out_err:
         return clnt;
 }