[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, 1 insertions, 5 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index f2317f3e29f9..ea784969fb85 100644
--- 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 9d3ddad96d9e..0e82617f2de0 100644
--- 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;