Commit 5b616f5d authored by Trond Myklebust's avatar Trond Myklebust

[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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 334ccfd5
...@@ -193,10 +193,8 @@ nlm_bind_host(struct nlm_host *host) ...@@ -193,10 +193,8 @@ nlm_bind_host(struct nlm_host *host)
/* Existing NLM servers accept AUTH_UNIX only */ /* Existing NLM servers accept AUTH_UNIX only */
clnt = rpc_create_client(xprt, host->h_name, &nlm_program, clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
host->h_version, RPC_AUTH_UNIX); host->h_version, RPC_AUTH_UNIX);
if (IS_ERR(clnt)) { if (IS_ERR(clnt))
xprt_destroy(xprt);
goto forgetit; goto forgetit;
}
clnt->cl_autobind = 1; /* turn on pmap queries */ clnt->cl_autobind = 1; /* turn on pmap queries */
xprt->nocong = 1; /* No congestion control for NLM */ xprt->nocong = 1; /* No congestion control for NLM */
xprt->resvport = 1; /* NLM requires a reserved port */ xprt->resvport = 1; /* NLM requires a reserved port */
......
...@@ -120,15 +120,14 @@ nsm_create(void) ...@@ -120,15 +120,14 @@ nsm_create(void)
&nsm_program, SM_VERSION, &nsm_program, SM_VERSION,
RPC_AUTH_NULL); RPC_AUTH_NULL);
if (IS_ERR(clnt)) if (IS_ERR(clnt))
goto out_destroy; goto out_err;
clnt->cl_softrtry = 1; clnt->cl_softrtry = 1;
clnt->cl_chatty = 1; clnt->cl_chatty = 1;
clnt->cl_oneshot = 1; clnt->cl_oneshot = 1;
xprt->resvport = 1; /* NSM requires a reserved port */ xprt->resvport = 1; /* NSM requires a reserved port */
return clnt; return clnt;
out_destroy: out_err:
xprt_destroy(xprt);
return clnt; return clnt;
} }
......
...@@ -383,7 +383,6 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data) ...@@ -383,7 +383,6 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
return clnt; return clnt;
out_fail: out_fail:
xprt_destroy(xprt);
return clnt; return clnt;
} }
...@@ -1623,7 +1622,6 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data, ...@@ -1623,7 +1622,6 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
if (IS_ERR(clnt)) { if (IS_ERR(clnt)) {
up_write(&clp->cl_sem); up_write(&clp->cl_sem);
printk(KERN_WARNING "NFS: cannot create RPC client.\n"); printk(KERN_WARNING "NFS: cannot create RPC client.\n");
xprt_destroy(xprt);
err = PTR_ERR(clnt); err = PTR_ERR(clnt);
goto out_fail; goto out_fail;
} }
......
...@@ -80,9 +80,7 @@ mnt_create(char *hostname, struct sockaddr_in *srvaddr, int version, ...@@ -80,9 +80,7 @@ mnt_create(char *hostname, struct sockaddr_in *srvaddr, int version,
clnt = rpc_create_client(xprt, hostname, clnt = rpc_create_client(xprt, hostname,
&mnt_program, version, &mnt_program, version,
RPC_AUTH_UNIX); RPC_AUTH_UNIX);
if (IS_ERR(clnt)) { if (!IS_ERR(clnt)) {
xprt_destroy(xprt);
} else {
clnt->cl_softrtry = 1; clnt->cl_softrtry = 1;
clnt->cl_chatty = 1; clnt->cl_chatty = 1;
clnt->cl_oneshot = 1; clnt->cl_oneshot = 1;
......
...@@ -430,7 +430,7 @@ nfsd4_probe_callback(struct nfs4_client *clp) ...@@ -430,7 +430,7 @@ nfsd4_probe_callback(struct nfs4_client *clp)
clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX); clnt = rpc_create_client(xprt, hostname, program, 1, RPC_AUTH_UNIX);
if (IS_ERR(clnt)) { if (IS_ERR(clnt)) {
dprintk("NFSD: couldn't create callback client\n"); dprintk("NFSD: couldn't create callback client\n");
goto out_xprt; goto out_err;
} }
clnt->cl_intr = 0; clnt->cl_intr = 0;
clnt->cl_softrtry = 1; clnt->cl_softrtry = 1;
...@@ -465,8 +465,6 @@ nfsd4_probe_callback(struct nfs4_client *clp) ...@@ -465,8 +465,6 @@ nfsd4_probe_callback(struct nfs4_client *clp)
out_clnt: out_clnt:
rpc_shutdown_client(clnt); rpc_shutdown_client(clnt);
goto out_err; goto out_err;
out_xprt:
xprt_destroy(xprt);
out_err: out_err:
dprintk("NFSD: warning: no callback path to client %.*s\n", dprintk("NFSD: warning: no callback path to client %.*s\n",
(int)clp->cl_name.len, clp->cl_name.data); (int)clp->cl_name.len, clp->cl_name.data);
......
...@@ -178,6 +178,7 @@ rpc_create_client(struct rpc_xprt *xprt, char *servname, ...@@ -178,6 +178,7 @@ rpc_create_client(struct rpc_xprt *xprt, char *servname,
kfree(clnt->cl_server); kfree(clnt->cl_server);
kfree(clnt); kfree(clnt);
out_err: out_err:
xprt_destroy(xprt);
return ERR_PTR(err); return ERR_PTR(err);
} }
......
...@@ -210,9 +210,7 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto) ...@@ -210,9 +210,7 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto)
clnt = rpc_create_client(xprt, hostname, clnt = rpc_create_client(xprt, hostname,
&pmap_program, RPC_PMAP_VERSION, &pmap_program, RPC_PMAP_VERSION,
RPC_AUTH_UNIX); RPC_AUTH_UNIX);
if (IS_ERR(clnt)) { if (!IS_ERR(clnt)) {
xprt_destroy(xprt);
} else {
clnt->cl_softrtry = 1; clnt->cl_softrtry = 1;
clnt->cl_chatty = 1; clnt->cl_chatty = 1;
clnt->cl_oneshot = 1; clnt->cl_oneshot = 1;
......
...@@ -61,7 +61,6 @@ EXPORT_SYMBOL(rpc_mkpipe); ...@@ -61,7 +61,6 @@ EXPORT_SYMBOL(rpc_mkpipe);
/* Client transport */ /* Client transport */
EXPORT_SYMBOL(xprt_create_proto); EXPORT_SYMBOL(xprt_create_proto);
EXPORT_SYMBOL(xprt_destroy);
EXPORT_SYMBOL(xprt_set_timeout); EXPORT_SYMBOL(xprt_set_timeout);
EXPORT_SYMBOL(xprt_udp_slot_table_entries); EXPORT_SYMBOL(xprt_udp_slot_table_entries);
EXPORT_SYMBOL(xprt_tcp_slot_table_entries); EXPORT_SYMBOL(xprt_tcp_slot_table_entries);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment