From patchwork Fri Jan 14 06:45:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Liankun X-Patchwork-Id: 477461 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 p0E6duVr006229 for ; Fri, 14 Jan 2011 06:39:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334Ab1ANGjz (ORCPT ); Fri, 14 Jan 2011 01:39:55 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:63204 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751046Ab1ANGjz (ORCPT ); Fri, 14 Jan 2011 01:39:55 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 8E10017012E for ; Fri, 14 Jan 2011 14:39:52 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p0E6UdVf014537 for ; Fri, 14 Jan 2011 14:34:37 +0800 Received: from [10.167.225.142] ([10.167.225.142]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011011414374216-171716 ; Fri, 14 Jan 2011 14:37:42 +0800 Message-ID: <4D2FF124.7020500@cn.fujitsu.com> Date: Fri, 14 Jan 2011 14:45:56 +0800 From: Fu Liankun User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: linux-nfs@vger.kernel.org Subject: [PATCH] NFSV4 :All lock operations should be sent to the server for resolution X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-14 14:37:42, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-14 14:39:23, Serialize complete at 2011-01-14 14:39:23 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]); Fri, 14 Jan 2011 06:39:58 +0000 (UTC) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 0f24cdf..3bba85b 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4215,13 +4215,6 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock if (status < 0) goto out; down_read(&nfsi->rwsem); - if (test_bit(NFS_DELEGATED_STATE, &state->flags)) { - /* Yes: cache locks! */ - /* ...but avoid races with delegation recall... */ - request->fl_flags = fl_flags & ~FL_SLEEP; - status = do_vfs_lock(request->fl_file, request); - goto out_unlock; - } status = _nfs4_do_setlk(state, cmd, request, NFS_LOCK_NEW); if (status != 0) goto out_unlock;