NFS: Clean up _nfs4_proc_exchange_id()

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 184d57a5098d920eb11ef0a19c63e85fd9eeeaf1..a3808826b6554efe876e77a7b484d8d752304654 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7453,15 +7453,14 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
        };
        struct nfs41_exchange_id_data *calldata;
        struct rpc_task *task;
-       int status = -EIO;
+       int status;
 
        if (!atomic_inc_not_zero(&clp->cl_count))
-               goto out;
+               return -EIO;
 
-       status = -ENOMEM;
        calldata = kzalloc(sizeof(*calldata), GFP_NOFS);
        if (!calldata)
-               goto out;
+               return -ENOMEM;
 
        if (!xprt)
                nfs4_init_boot_verifier(clp, &verifier);
@@ -7470,10 +7469,6 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
        if (status)
                goto out_calldata;
 
-       dprintk("NFS call  exchange_id auth=%s, '%s'\n",
-               clp->cl_rpcclient->cl_auth->au_ops->au_name,
-               clp->cl_owner_id);
-
        calldata->res.server_owner = kzalloc(sizeof(struct nfs41_server_owner),
                                                GFP_NOFS);
        status = -ENOMEM;
@@ -7539,13 +7534,6 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
 
        rpc_put_task(task);
 out:
-       if (clp->cl_implid != NULL)
-               dprintk("NFS reply exchange_id: Server Implementation ID: "
-                       "domain: %s, name: %s, date: %llu,%u\n",
-                       clp->cl_implid->domain, clp->cl_implid->name,
-                       clp->cl_implid->date.seconds,
-                       clp->cl_implid->date.nseconds);
-       dprintk("NFS reply exchange_id: %d\n", status);
        return status;
 
 out_impl_id: