From 583d63a3d9ddc2259e344bf1a7d45a57ad94a2e4 Mon Sep 17 00:00:00 2001 From: Marc Eshel Date: Fri, 3 Apr 2009 08:27:46 +0300 Subject: [PATCH] --- yaml --- r: 142185 b: refs/heads/master c: 9fb870702d02c05f9410423bfff3f63e46e26180 h: refs/heads/master i: 142183: 630e1d84fc8dd2223fdab5ba8c838ef9e6f5c53f v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 1 + trunk/include/linux/nfsd/state.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 63a44edadfb3..282d89dc6cd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7116ed6b9973021ff43edeb10f4cb834db94000f +refs/heads/master: 9fb870702d02c05f9410423bfff3f63e46e26180 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 8c70f12159b6..b2611999600a 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -528,6 +528,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir) INIT_LIST_HEAD(&clp->cl_strhash); INIT_LIST_HEAD(&clp->cl_openowners); INIT_LIST_HEAD(&clp->cl_delegations); + INIT_LIST_HEAD(&clp->cl_sessions); INIT_LIST_HEAD(&clp->cl_lru); return clp; } diff --git a/trunk/include/linux/nfsd/state.h b/trunk/include/linux/nfsd/state.h index baea7f1fdb4a..7faefc7c9d9a 100644 --- a/trunk/include/linux/nfsd/state.h +++ b/trunk/include/linux/nfsd/state.h @@ -163,6 +163,9 @@ struct nfs4_client { struct nfs4_callback cl_callback; /* callback info */ atomic_t cl_count; /* ref count */ u32 cl_firststate; /* recovery dir creation */ + + /* for nfs41 */ + struct list_head cl_sessions; }; /* struct nfs4_client_reset