3 files changed, 9 insertions, 9 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 471fc9b927a9..39db1beb92f8 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -238,6 +238,7 @@ static void nfs4_shutdown_client(struct nfs_client *clp)
 
         rpc_destroy_wait_queue(&clp->cl_rpcwaitq);
         kfree(clp->cl_serverscope);
+        kfree(clp->cl_implid);
 }
 
 /* idr_remove_all is not needed as all id's are removed by nfs_put_client */
@@ -306,7 +307,6 @@ static void nfs_free_client(struct nfs_client *clp)
 
         put_net(clp->net);
         kfree(clp->cl_hostname);
-        kfree(clp->impl_id);
         kfree(clp);
 
         dprintk("<-- nfs_free_client()\n");
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 94494f24bb12..daa4e1b17313 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5119,8 +5119,8 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
 
         if (!status) {
                 /* use the most recent implementation id */
-                kfree(clp->impl_id);
-                clp->impl_id = res.impl_id;
+                kfree(clp->cl_implid);
+                clp->cl_implid = res.impl_id;
         } else
                 kfree(res.impl_id);
 
@@ -5144,12 +5144,12 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred)
 out_server_scope:
         kfree(res.server_scope);
 out:
-        if (clp->impl_id)
+        if (clp->cl_implid)
                 dprintk("%s: Server Implementation ID: "
                         "domain: %s, name: %s, date: %llu,%u\n",
-                        __func__, clp->impl_id->domain, clp->impl_id->name,
-                        clp->impl_id->date.seconds,
-                        clp->impl_id->date.nseconds);
+                        __func__, clp->cl_implid->domain, clp->cl_implid->name,
+                        clp->cl_implid->date.seconds,
+                        clp->cl_implid->date.nseconds);
         dprintk("<-- %s status= %d\n", __func__, status);
         return status;
 }
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index a973eb101a92..ff656c022684 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -796,8 +796,8 @@ static void show_pnfs(struct seq_file *m, struct nfs_server *server)
 
 static void show_implementation_id(struct seq_file *m, struct nfs_server *nfss)
 {
-        if (nfss->nfs_client && nfss->nfs_client->impl_id) {
-                struct nfs41_impl_id *impl_id = nfss->nfs_client->impl_id;
+        if (nfss->nfs_client && nfss->nfs_client->cl_implid) {
+                struct nfs41_impl_id *impl_id = nfss->nfs_client->cl_implid;
                 seq_printf(m, "\n\timpl_id:\tname='%s',domain='%s',"
                            "date='%llu,%u'",
                            impl_id->name, impl_id->domain,