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>
---
 fs/lockd/host.c          |    4 +---
 fs/lockd/mon.c           |    5 ++---
 fs/nfs/inode.c           |    2 --
 fs/nfs/mount_clnt.c      |    4 +---
 fs/nfsd/nfs4callback.c   |    4 +---
 net/sunrpc/clnt.c        |    1 +
 net/sunrpc/pmap_clnt.c   |    4 +---
 net/sunrpc/sunrpc_syms.c |    1 -
 8 files changed, 7 insertions(+), 18 deletions(-)

Index: linux-2.6.12-rc1/net/sunrpc/pmap_clnt.c
===================================================================
--- linux-2.6.12-rc1.orig/net/sunrpc/pmap_clnt.c
+++ linux-2.6.12-rc1/net/sunrpc/pmap_clnt.c
@@ -210,9 +210,7 @@ pmap_create(char *hostname, struct socka
 	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;
Index: linux-2.6.12-rc1/fs/nfs/inode.c
===================================================================
--- linux-2.6.12-rc1.orig/fs/nfs/inode.c
+++ linux-2.6.12-rc1/fs/nfs/inode.c
@@ -383,7 +383,6 @@ nfs_create_client(struct nfs_server *ser
 	return clnt;
 
 out_fail:
-	xprt_destroy(xprt);
 	return clnt;
 }
 
@@ -1623,7 +1622,6 @@ static int nfs4_fill_super(struct super_
 		if (IS_ERR(clnt)) {
 			up_write(&clp->cl_sem);
 			printk(KERN_WARNING "NFS: cannot create RPC client.\n");
-			xprt_destroy(xprt);
 			err = PTR_ERR(clnt);
 			goto out_fail;
 		}
Index: linux-2.6.12-rc1/fs/lockd/mon.c
===================================================================
--- linux-2.6.12-rc1.orig/fs/lockd/mon.c
+++ linux-2.6.12-rc1/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;
 }
 
Index: linux-2.6.12-rc1/fs/lockd/host.c
===================================================================
--- linux-2.6.12-rc1.orig/fs/lockd/host.c
+++ linux-2.6.12-rc1/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 */
Index: linux-2.6.12-rc1/fs/nfsd/nfs4callback.c
===================================================================
--- linux-2.6.12-rc1.orig/fs/nfsd/nfs4callback.c
+++ linux-2.6.12-rc1/fs/nfsd/nfs4callback.c
@@ -428,7 +428,7 @@ nfsd4_probe_callback(struct nfs4_client 
 	sprintf(hostname, "%u.%u.%u.%u", NIPQUAD(addr.sin_addr.s_addr));
 	if (!(clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX))) {
 		dprintk("NFSD: couldn't create callback client\n");
-		goto out_xprt;
+		goto out_err;
 	}
 	clnt->cl_intr = 0;
 	clnt->cl_softrtry = 1;
@@ -463,8 +463,6 @@ out_rpciod:
 out_clnt:
 	rpc_shutdown_client(clnt);
 	goto out_err;
-out_xprt:
-	xprt_destroy(xprt);
 out_err:
 	dprintk("NFSD: warning: no callback path to client %.*s\n",
 		(int)clp->cl_name.len, clp->cl_name.data);
Index: linux-2.6.12-rc1/net/sunrpc/clnt.c
===================================================================
--- linux-2.6.12-rc1.orig/net/sunrpc/clnt.c
+++ linux-2.6.12-rc1/net/sunrpc/clnt.c
@@ -178,6 +178,7 @@ out_no_path:
 		kfree(clnt->cl_server);
 	kfree(clnt);
 out_err:
+	xprt_destroy(xprt);
 	return ERR_PTR(err);
 }
 
Index: linux-2.6.12-rc1/fs/nfs/mount_clnt.c
===================================================================
--- linux-2.6.12-rc1.orig/fs/nfs/mount_clnt.c
+++ linux-2.6.12-rc1/fs/nfs/mount_clnt.c
@@ -80,9 +80,7 @@ mnt_create(char *hostname, struct sockad
 	clnt = rpc_create_client(xprt, hostname,
 				&mnt_program, 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;
Index: linux-2.6.12-rc1/net/sunrpc/sunrpc_syms.c
===================================================================
--- linux-2.6.12-rc1.orig/net/sunrpc/sunrpc_syms.c
+++ linux-2.6.12-rc1/net/sunrpc/sunrpc_syms.c
@@ -61,7 +61,6 @@ EXPORT_SYMBOL(rpc_mkpipe);
 
 /* 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);