diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2012-05-21 22:44:31 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-05-22 16:45:43 -0400 |
commit | 79d4e1f0d8910f0214a57832ca6d589640d572c0 (patch) | |
tree | c32a4ff22864b554061b0ea6f81667f9f4ef14cf /include | |
parent | 722baafc9e638714a69aa66e9ed24ef961ff350c (diff) |
NFS: Use proper naming conventions for NFSv4.1 server scope fields
Clean up: When naming fields and data types, follow established
conventions to facilitate accurate grep/cscope searches.
Additionally, for consistency, move the scope 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 99fe60d0 "nfs41: exchange_id operation", April
1 2009.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/nfs_fs_sb.h | 4 | ||||
-rw-r--r-- | include/linux/nfs_xdr.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 5498e9d9ba84..900d733668eb 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -17,7 +17,7 @@ struct nfs4_sequence_args; | |||
17 | struct nfs4_sequence_res; | 17 | struct nfs4_sequence_res; |
18 | struct nfs_server; | 18 | struct nfs_server; |
19 | struct nfs4_minor_version_ops; | 19 | struct nfs4_minor_version_ops; |
20 | struct server_scope; | 20 | struct nfs41_server_scope; |
21 | struct nfs41_impl_id; | 21 | struct nfs41_impl_id; |
22 | 22 | ||
23 | /* | 23 | /* |
@@ -80,13 +80,13 @@ struct nfs_client { | |||
80 | /* The flags used for obtaining the clientid during EXCHANGE_ID */ | 80 | /* The flags used for obtaining the clientid during EXCHANGE_ID */ |
81 | u32 cl_exchange_flags; | 81 | u32 cl_exchange_flags; |
82 | struct nfs4_session *cl_session; /* shared session */ | 82 | struct nfs4_session *cl_session; /* shared session */ |
83 | struct nfs41_server_scope *cl_serverscope; | ||
83 | #endif /* CONFIG_NFS_V4 */ | 84 | #endif /* CONFIG_NFS_V4 */ |
84 | 85 | ||
85 | #ifdef CONFIG_NFS_FSCACHE | 86 | #ifdef CONFIG_NFS_FSCACHE |
86 | struct fscache_cookie *fscache; /* client index cache cookie */ | 87 | struct fscache_cookie *fscache; /* client index cache cookie */ |
87 | #endif | 88 | #endif |
88 | 89 | ||
89 | struct server_scope *server_scope; /* from exchange_id */ | ||
90 | struct nfs41_impl_id *impl_id; /* from exchange_id */ | 90 | struct nfs41_impl_id *impl_id; /* from exchange_id */ |
91 | struct net *net; | 91 | struct net *net; |
92 | }; | 92 | }; |
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 2e53a3f1d2ff..c420b8d60a55 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
@@ -1104,7 +1104,7 @@ struct server_owner { | |||
1104 | char major_id[NFS4_OPAQUE_LIMIT]; | 1104 | char major_id[NFS4_OPAQUE_LIMIT]; |
1105 | }; | 1105 | }; |
1106 | 1106 | ||
1107 | struct server_scope { | 1107 | struct nfs41_server_scope { |
1108 | uint32_t server_scope_sz; | 1108 | uint32_t server_scope_sz; |
1109 | char server_scope[NFS4_OPAQUE_LIMIT]; | 1109 | char server_scope[NFS4_OPAQUE_LIMIT]; |
1110 | }; | 1110 | }; |
@@ -1118,7 +1118,7 @@ struct nfs41_impl_id { | |||
1118 | struct nfs41_exchange_id_res { | 1118 | struct nfs41_exchange_id_res { |
1119 | struct nfs_client *client; | 1119 | struct nfs_client *client; |
1120 | u32 flags; | 1120 | u32 flags; |
1121 | struct server_scope *server_scope; | 1121 | struct nfs41_server_scope *server_scope; |
1122 | struct nfs41_impl_id *impl_id; | 1122 | struct nfs41_impl_id *impl_id; |
1123 | }; | 1123 | }; |
1124 | 1124 | ||