From patchwork Wed Apr 27 01:12:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mi Jinlong X-Patchwork-Id: 735111 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3R1PJrI008070 for ; Wed, 27 Apr 2011 01:25:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755319Ab1D0BZQ (ORCPT ); Tue, 26 Apr 2011 21:25:16 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64228 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755066Ab1D0BZP (ORCPT ); Tue, 26 Apr 2011 21:25:15 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 1D2C8170118; Wed, 27 Apr 2011 09:25:14 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p3R1PDA7004927; Wed, 27 Apr 2011 09:25:13 +0800 Received: from [127.0.0.1] ([10.167.225.24]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011042709103338-154425 ; Wed, 27 Apr 2011 09:10:33 +0800 Message-ID: <4DB76D60.3010802@cn.fujitsu.com> Date: Wed, 27 Apr 2011 09:12:00 +0800 From: Mi Jinlong User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: "J. Bruce Fields" CC: NFS Subject: [PATCH] nfsd41: Deny new lock before RECLAIM_COMPLETE done X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-27 09:10:33, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-27 09:25:41, Serialize complete at 2011-04-27 09:25:41 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Apr 2011 01:25:20 +0000 (UTC) Before nfs41 client's RECLAIM_COMPLETE done, nfs server should deny it's new lock. Signed-off-by: Mi Jinlong --- fs/nfsd/nfs4state.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 4b36ec3..43cda94 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3803,6 +3803,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, */ struct nfs4_stateid *open_stp = NULL; + /* + * RFC5661 18.51.3 + * Before RECLAIM_COMPLETE done, return NFS4ERR_GRACE + */ + status = nfserr_grace; + if (nfsd4_has_session(cstate) && + !cstate->session->se_client->cl_firststate) + goto out; + status = nfserr_stale_clientid; if (!nfsd4_has_session(cstate) && STALE_CLIENTID(&lock->lk_new_clientid))