commit 5b616f5d596c0b056129f8aeafbc08409b3cd050
author Trond Myklebust <Trond.Myklebust@netapp.com> Wed Jun 22 17:16:20 2005 +0000
committer Trond Myklebust <Trond.Myklebust@netapp.com> Wed Jun 22 16:07:03 2005 -0400
tree bdbd2eb5bd1f8a26c7287e21be25ec50db075459
parent 334ccfd545bba9690515f2c5c167d5adb161989b

[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>

net/sunrpc/clnt.c

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 209aaf5..99515d7 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -178,6 +178,7 @@
 		kfree(clnt->cl_server);
 	kfree(clnt);
 out_err:
+	xprt_destroy(xprt);
 	return ERR_PTR(err);
 }
 

net/sunrpc/pmap_clnt.c

diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index d0b1d2c..97c420f 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -210,9 +210,7 @@
 	clnt = rpc_create_client(xprt, hostname,
 				&pmap_program, RPC_PMAP_VERSION,
 				RPC_AUTH_UNIX);
-	if (IS_ERR(clnt)) {
-		xprt_destroy(xprt);
-	} else {
+	if (!IS_ERR(clnt)) {
 		clnt->cl_softrtry = 1;
 		clnt->cl_chatty   = 1;
 		clnt->cl_oneshot  = 1;

net/sunrpc/sunrpc_syms.c

diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
index d4f26bf..1b0ff7e 100644
--- a/net/sunrpc/sunrpc_syms.c
+++ b/net/sunrpc/sunrpc_syms.c
@@ -61,7 +61,6 @@
 
 /* Client transport */
 EXPORT_SYMBOL(xprt_create_proto);
-EXPORT_SYMBOL(xprt_destroy);
 EXPORT_SYMBOL(xprt_set_timeout);
 EXPORT_SYMBOL(xprt_udp_slot_table_entries);
 EXPORT_SYMBOL(xprt_tcp_slot_table_entries);