diff options
author | Marc Eshel <eshel@almaden.ibm.com> | 2009-04-03 01:27:46 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-04-03 20:41:13 -0400 |
commit | 9fb870702d02c05f9410423bfff3f63e46e26180 (patch) | |
tree | 849fd556192da4b34cc872a36f8ad415e87775c6 | |
parent | 7116ed6b9973021ff43edeb10f4cb834db94000f (diff) |
nfsd41: introduce nfs4_client cl_sessions list
[get rid of CONFIG_NFSD_V4_1]
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r-- | fs/nfsd/nfs4state.c | 1 | ||||
-rw-r--r-- | include/linux/nfsd/state.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 8c70f12159b6..b2611999600a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -528,6 +528,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir) | |||
528 | INIT_LIST_HEAD(&clp->cl_strhash); | 528 | INIT_LIST_HEAD(&clp->cl_strhash); |
529 | INIT_LIST_HEAD(&clp->cl_openowners); | 529 | INIT_LIST_HEAD(&clp->cl_openowners); |
530 | INIT_LIST_HEAD(&clp->cl_delegations); | 530 | INIT_LIST_HEAD(&clp->cl_delegations); |
531 | INIT_LIST_HEAD(&clp->cl_sessions); | ||
531 | INIT_LIST_HEAD(&clp->cl_lru); | 532 | INIT_LIST_HEAD(&clp->cl_lru); |
532 | return clp; | 533 | return clp; |
533 | } | 534 | } |
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index baea7f1fdb4a..7faefc7c9d9a 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h | |||
@@ -163,6 +163,9 @@ struct nfs4_client { | |||
163 | struct nfs4_callback cl_callback; /* callback info */ | 163 | struct nfs4_callback cl_callback; /* callback info */ |
164 | atomic_t cl_count; /* ref count */ | 164 | atomic_t cl_count; /* ref count */ |
165 | u32 cl_firststate; /* recovery dir creation */ | 165 | u32 cl_firststate; /* recovery dir creation */ |
166 | |||
167 | /* for nfs41 */ | ||
168 | struct list_head cl_sessions; | ||
166 | }; | 169 | }; |
167 | 170 | ||
168 | /* struct nfs4_client_reset | 171 | /* struct nfs4_client_reset |