NFS: Clean up nfs4_set_client()

If we cut out the dprintk()s, then we can return error codes directly
and cut out the goto.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Orabug: 27679350
(cherry picked from commit 2dc42c0d60e0104f7cd8beee3871f953565392ff)
Signed-off-by: Calum Mackay <calum.mackay@oracle.com>
Reviewed-by: Manjunath Patil <manjunath.b.patil@oracle.com>

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index e582db4bd5617c52a44152dbd16adcf41b11260d..f4751ea18db29c9b9b8c0c624364bdc567f18050 100644 (file)
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -804,9 +804,6 @@ static int nfs4_set_client(struct nfs_server *server,
                .net = net,
        };
        struct nfs_client *clp;
-       int error;
-
-       dprintk("--> nfs4_set_client()\n");
 
        if (server->flags & NFS_MOUNT_NORESVPORT)
                set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
@@ -817,15 +814,11 @@ static int nfs4_set_client(struct nfs_server *server,
 
        /* Allocate or find a client reference we can use */
        clp = nfs_get_client(&cl_init, timeparms, ip_addr, authflavour);
-       if (IS_ERR(clp)) {
-               error = PTR_ERR(clp);
-               goto error;
-       }
+       if (IS_ERR(clp))
+               return PTR_ERR(clp);
 
-       if (server->nfs_client == clp) {
-               error = -ELOOP;
-               goto error;
-       }
+       if (server->nfs_client == clp)
+               return -ELOOP;
 
        /*
         * Query for the lease time on clientid setup or renewal
@@ -837,11 +830,7 @@ static int nfs4_set_client(struct nfs_server *server,
        set_bit(NFS_CS_CHECK_LEASE_TIME, &clp->cl_res_state);
 
        server->nfs_client = clp;
-       dprintk("<-- nfs4_set_client() = 0 [new %p]\n", clp);
        return 0;
-error:
-       dprintk("<-- nfs4_set_client() = xerror %d\n", error);
-       return error;
 }
 
 /*