diff options
author | David Howells <dhowells@redhat.com> | 2006-08-22 20:06:09 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-22 23:24:32 -0400 |
commit | 7539bbab8062aadc1db95a22b377146843cfa88f (patch) | |
tree | 697983ea016cbe378e4f2128846edebd78e468b9 /fs/nfs/super.c | |
parent | adfa6f980bd46974e6b32b22dd0c45e3f52063f4 (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/super.c')
-rw-r--r-- | fs/nfs/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index d03ede5b1aca..ab4c78ee840c 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -1141,7 +1141,7 @@ static struct rpc_clnt *nfs4_create_client(struct nfs_server *server, | |||
1141 | list_add_tail(&server->nfs4_siblings, &clp->cl_superblocks); | 1141 | list_add_tail(&server->nfs4_siblings, &clp->cl_superblocks); |
1142 | clnt = rpc_clone_client(clp->cl_rpcclient); | 1142 | clnt = rpc_clone_client(clp->cl_rpcclient); |
1143 | if (!IS_ERR(clnt)) | 1143 | if (!IS_ERR(clnt)) |
1144 | server->nfs4_state = clp; | 1144 | server->nfs_client = clp; |
1145 | up_write(&clp->cl_sem); | 1145 | up_write(&clp->cl_sem); |
1146 | clp = NULL; | 1146 | clp = NULL; |
1147 | 1147 | ||
@@ -1151,7 +1151,7 @@ static struct rpc_clnt *nfs4_create_client(struct nfs_server *server, | |||
1151 | return clnt; | 1151 | return clnt; |
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | if (server->nfs4_state->cl_idmap == NULL) { | 1154 | if (server->nfs_client->cl_idmap == NULL) { |
1155 | dprintk("%s: failed to create idmapper.\n", __FUNCTION__); | 1155 | dprintk("%s: failed to create idmapper.\n", __FUNCTION__); |
1156 | return ERR_PTR(-ENOMEM); | 1156 | return ERR_PTR(-ENOMEM); |
1157 | } | 1157 | } |
@@ -1416,7 +1416,7 @@ static inline char *nfs4_dup_path(const struct dentry *dentry) | |||
1416 | static struct super_block *nfs4_clone_sb(struct nfs_server *server, struct nfs_clone_mount *data) | 1416 | static struct super_block *nfs4_clone_sb(struct nfs_server *server, struct nfs_clone_mount *data) |
1417 | { | 1417 | { |
1418 | const struct dentry *dentry = data->dentry; | 1418 | const struct dentry *dentry = data->dentry; |
1419 | struct nfs_client *clp = server->nfs4_state; | 1419 | struct nfs_client *clp = server->nfs_client; |
1420 | struct super_block *sb; | 1420 | struct super_block *sb; |
1421 | 1421 | ||
1422 | server->fsid = data->fattr->fsid; | 1422 | server->fsid = data->fattr->fsid; |