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

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 52707c5ad6ea7d7e56a2e90a69e0a9375504e203..90a62f27914c737757937e68dedf5f6abe0e7823 100644 (file)
--- 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 6fc1bebeec1df16419881b2018dbed2616ad5c15..81b5e7778d70c88e8bc4359ec5595598a80c9e07 100644 (file)
--- 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;
 }
 

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index f2317f3e29f9d54b586b511128478212e8664348..ea784969fb855b91d94b7c8a5597776addc765cb 100644 (file)
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -383,7 +383,6 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
        return clnt;
 
 out_fail:
-       xprt_destroy(xprt);
        return clnt;
 }
 
@@ -1623,7 +1622,6 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
                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;
                }

diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index 9d3ddad96d9ea0ce76bdca219a490677c4f37ae5..0e82617f2de0616c06fbaef233dd5e6bbea397e6 100644 (file)
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -80,9 +80,7 @@ mnt_create(char *hostname, struct sockaddr_in *srvaddr, int version,
        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;

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 1a55dfcb74bcb62b5bfb10fae788a3b56afc4f75..634465e9cfc6edf57fd819cffe9af0af944aa82d 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -430,7 +430,7 @@ nfsd4_probe_callback(struct nfs4_client *clp)
        clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX);
        if (IS_ERR(clnt)) {
                dprintk("NFSD: couldn't create callback client\n");
-               goto out_xprt;
+               goto out_err;
        }
        clnt->cl_intr = 0;
        clnt->cl_softrtry = 1;
@@ -465,8 +465,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);

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 209aaf5956958e1dfa086b7a3ba05b2e71088f47..99515d7727a61fb7bc1788dd2e42fc0ad39bafda 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/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);
 }
 

diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index d0b1d2c34a4db29939eeee23d66737a59e6c28c7..97c420ff1ee004afaf8dc35b6173df37dab9290b 100644 (file)
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -210,9 +210,7 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto)
        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;

diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
index d4f26bf9e732036f9defa62d2028ec057bad9b94..1b0ff7e0e86977d4a9b9ff6505ad0ee1805dbfbc 100644 (file)
--- a/net/sunrpc/sunrpc_syms.c
+++ b/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);