From fb7b98d17be51dd38d49e34f35c3e8afb4869b19 Mon Sep 17 00:00:00 2001
From: Mi Jinlong <mijinlong@cn.fujitsu.com>
Date: Thu, 14 Jul 2011 15:06:26 +0800
Subject: [PATCH] --- yaml --- r: 259055 b: refs/heads/master c:
 ab1350b2b3c1dd2e465a6abdda608d8c44facfb8 h: refs/heads/master i:   259053:
 e8433da7a157af81e8166cc699f80fd761a737bf   259051:
 7d7e42337603e8c58dda290ce15f5b11b042db74   259047:
 8f119038acf5aef78326436905dfaa1a86c7ac23   259039:
 c698e0ea1aad331720e38ec012647ffaebe2fd20 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/nfsd/nfs4proc.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 500ccedd822a..0629917d65c0 100644
--- 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
index 96b69299dcbe..121fd84e7f90 100644
--- 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);