summaryrefslogtreecommitdiff
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2012-05-22 06:44:41 +0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-05-23 00:45:43 +0400
commit591555465ec513c42416392d392fd56866cb220c (patch)
tree8b7ce3d4fe39e31e48e3e7a1a604675395607888 /fs/nfs/client.c
parent79d4e1f0d8910f0214a57832ca6d589640d572c0 (diff)
downloadlinux-591555465ec513c42416392d392fd56866cb220c.tar.xz
NFS: Use proper naming conventions for nfs_client.impl_id field
Clean up: When naming fields and data types, follow established conventions to facilitate accurate grep/cscope searches. Additionally, for consistency, move the impl_id field into the NFSv4- specific part of the nfs_client, and free that memory in the logic that shuts down NFSv4 nfs_clients. Introduced by commit 7d2ed9ac "NFSv4: parse and display server implementation ids," Fri Feb 17, 2012. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c2
1 files changed, 1 insertions, 1 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");