Hi Bruce, Sorry for so late to reply you. J. Bruce Fields: > On Wed, Apr 27, 2011 at 09:12:00AM +0800, Mi Jinlong wrote: >> Before nfs41 client's RECLAIM_COMPLETE done, nfs server should >> deny it's new lock. >> >> Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> > > Is nfserr_grace the right error? (Honest question, I haven't looked it > up.) Yes, rfc5661 says: " Whenever a client establishes a new client ID and before it does the first non-reclaim operation that obtains a lock, it MUST send a RECLAIM_COMPLETE with rca_one_fs set to FALSE, even if there are no locks to reclaim. If non-reclaim locking operations are done before the RECLAIM_COMPLETE, an NFS4ERR_GRACE error will be returned. " > > Also I'd think this check should go in nfsd4_open: opens are also > prohibited before RECLAIM_COMPLETE, and if we check there then we don't > need to check here, as you have to have open state before you can do a > lock. Agree with you, what about the following one?? -- ---- thanks Mi Jinlong =============================== >From 3b7b82cd41823a52b77fd2c4419ab635f6e5893b Mon Sep 17 00:00:00 2001 From: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> Date: Tue, 10 May 2011 14:07:44 +0800 Subject: [PATCH] nfsd41: Deny new lock before RECLAIM_COMPLETE done Before nfs41 client's RECLAIM_COMPLETE done, nfs server should deny any new locks or opens. Signed-off-by: Mi Jinlong <mijinlong@xxxxxxxxxxxxxx> --- fs/nfsd/nfs4proc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 5fcb139..d71dd4d 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -291,6 +291,15 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, if (open->op_create && open->op_claim_type != NFS4_OPEN_CLAIM_NULL) return nfserr_inval; + /* + * RFC5661 18.51.3 + * Before RECLAIM_COMPLETE done, server should deny new lock + */ + if (nfsd4_has_session(cstate) && + !cstate->session->se_client->cl_firststate && + open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS) + return nfserr_grace; + if (nfsd4_has_session(cstate)) copy_clientid(&open->op_clientid, cstate->session); -- 1.7.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html