aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNeilBrown <neilb@cse.unsw.edu.au>2005-06-24 01:04:17 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:06:35 -0400
commitea1da636e956ad1591a74904f23d98bbc26a644b (patch)
tree193d0667adad25b094e209856dfcc1300d1d85dc /include
parent21ab45a480ec7705d177e959ebf452d62340c004 (diff)
[PATCH] knfsd: nfsd4: rename state list fields
Trivial renaming patch: I can never remember, while looking at various lists relating the nfsd4 state structures, which are the "heads" and which are items on other lists, or which structures are actually on the various lists. The following convention helps me: given structures foo and bar, with foo containing the head of a list of bars, use "bars" for the name of the head of the list contained in the struct foo, and use "per_foo" for the entries in the struct bars. Already done for struct nfs4_file; go ahead and do it for the other nfsd4 state structures. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfsd/state.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 0e18ae22127d..f4f27b76ee64 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -72,8 +72,8 @@ struct nfs4_cb_recall {
72}; 72};
73 73
74struct nfs4_delegation { 74struct nfs4_delegation {
75 struct list_head dl_del_perfile; /* nfs4_file->fi_del_perfile */ 75 struct list_head dl_perfile;
76 struct list_head dl_del_perclnt; /* nfs4_client->cl_del_perclnt*/ 76 struct list_head dl_perclnt;
77 struct list_head dl_recall_lru; /* delegation recalled */ 77 struct list_head dl_recall_lru; /* delegation recalled */
78 atomic_t dl_count; /* ref count */ 78 atomic_t dl_count; /* ref count */
79 struct nfs4_client *dl_client; 79 struct nfs4_client *dl_client;
@@ -119,8 +119,8 @@ struct nfs4_callback {
119struct nfs4_client { 119struct nfs4_client {
120 struct list_head cl_idhash; /* hash by cl_clientid.id */ 120 struct list_head cl_idhash; /* hash by cl_clientid.id */
121 struct list_head cl_strhash; /* hash by cl_name */ 121 struct list_head cl_strhash; /* hash by cl_name */
122 struct list_head cl_perclient; /* list: stateowners */ 122 struct list_head cl_openowners;
123 struct list_head cl_del_perclnt; /* list: delegations */ 123 struct list_head cl_delegations;
124 struct list_head cl_lru; /* tail queue */ 124 struct list_head cl_lru; /* tail queue */
125 struct xdr_netobj cl_name; /* id generated by client */ 125 struct xdr_netobj cl_name; /* id generated by client */
126 char cl_recdir[HEXDIR_LEN]; /* recovery dir */ 126 char cl_recdir[HEXDIR_LEN]; /* recovery dir */
@@ -195,9 +195,9 @@ struct nfs4_stateowner {
195 struct kref so_ref; 195 struct kref so_ref;
196 struct list_head so_idhash; /* hash by so_id */ 196 struct list_head so_idhash; /* hash by so_id */
197 struct list_head so_strhash; /* hash by op_name */ 197 struct list_head so_strhash; /* hash by op_name */
198 struct list_head so_perclient; /* nfs4_client->cl_perclient */ 198 struct list_head so_perclient;
199 struct list_head so_perfilestate; /* list: nfs4_stateid */ 199 struct list_head so_stateids;
200 struct list_head so_perlockowner; /* nfs4_stateid->st_perlockowner */ 200 struct list_head so_perstateid; /* for lockowners only */
201 struct list_head so_close_lru; /* tail queue */ 201 struct list_head so_close_lru; /* tail queue */
202 time_t so_time; /* time of placement on so_close_lru */ 202 time_t so_time; /* time of placement on so_close_lru */
203 int so_is_open_owner; /* 1=openowner,0=lockowner */ 203 int so_is_open_owner; /* 1=openowner,0=lockowner */
@@ -240,8 +240,8 @@ struct nfs4_file {
240struct nfs4_stateid { 240struct nfs4_stateid {
241 struct list_head st_hash; 241 struct list_head st_hash;
242 struct list_head st_perfile; 242 struct list_head st_perfile;
243 struct list_head st_perfilestate; 243 struct list_head st_perstateowner;
244 struct list_head st_perlockowner; 244 struct list_head st_lockowners;
245 struct nfs4_stateowner * st_stateowner; 245 struct nfs4_stateowner * st_stateowner;
246 struct nfs4_file * st_file; 246 struct nfs4_file * st_file;
247 stateid_t st_stateid; 247 stateid_t st_stateid;