---

yaml --- r: 259055 b: refs/heads/master c: ab1350b h: refs/heads/master i: 259053: e8433da 259051: 7d7e423 259047: 8f11903 259039: c698e0e v: v3
git-mirror · Jul 15, 2011 · fb7b98d · fb7b98d
1 parent 52fc794
commit fb7b98d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee19cc406d4c0ae3118f59e000984d935b372871
+refs/heads/master: ab1350b2b3c1dd2e465a6abdda608d8c44facfb8
diff --git a/trunk/fs/nfsd/nfs4proc.c b/trunk/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);