aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4state.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-08-22 20:06:09 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-09-22 23:24:32 -0400
commit7539bbab8062aadc1db95a22b377146843cfa88f (patch)
tree697983ea016cbe378e4f2128846edebd78e468b9 /fs/nfs/nfs4state.c
parentadfa6f980bd46974e6b32b22dd0c45e3f52063f4 (diff)
NFS: Rename nfs_server::nfs4_state
Rename nfs_server::nfs4_state to nfs_client as it will be used to represent the client state for NFS2 and NFS3 also. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
-rw-r--r--fs/nfs/nfs4state.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index c0b6439f1f71..fa51a7d4c022 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -61,7 +61,7 @@ static LIST_HEAD(nfs4_clientid_list);
61void 61void
62init_nfsv4_state(struct nfs_server *server) 62init_nfsv4_state(struct nfs_server *server)
63{ 63{
64 server->nfs4_state = NULL; 64 server->nfs_client = NULL;
65 INIT_LIST_HEAD(&server->nfs4_siblings); 65 INIT_LIST_HEAD(&server->nfs4_siblings);
66} 66}
67 67
@@ -70,9 +70,9 @@ destroy_nfsv4_state(struct nfs_server *server)
70{ 70{
71 kfree(server->mnt_path); 71 kfree(server->mnt_path);
72 server->mnt_path = NULL; 72 server->mnt_path = NULL;
73 if (server->nfs4_state) { 73 if (server->nfs_client) {
74 nfs4_put_client(server->nfs4_state); 74 nfs4_put_client(server->nfs_client);
75 server->nfs4_state = NULL; 75 server->nfs_client = NULL;
76 } 76 }
77} 77}
78 78
@@ -306,7 +306,7 @@ nfs4_drop_state_owner(struct nfs4_state_owner *sp)
306 */ 306 */
307struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct rpc_cred *cred) 307struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct rpc_cred *cred)
308{ 308{
309 struct nfs_client *clp = server->nfs4_state; 309 struct nfs_client *clp = server->nfs_client;
310 struct nfs4_state_owner *sp, *new; 310 struct nfs4_state_owner *sp, *new;
311 311
312 get_rpccred(cred); 312 get_rpccred(cred);