From patchwork Fri Apr 22 16:45:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 727651 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 p3MGkpr0012888 for ; Fri, 22 Apr 2011 16:46:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756231Ab1DVQqu (ORCPT ); Fri, 22 Apr 2011 12:46:50 -0400 Received: from mx2.netapp.com ([216.240.18.37]:46503 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756211Ab1DVQqu (ORCPT ); Fri, 22 Apr 2011 12:46:50 -0400 X-IronPort-AV: E=Sophos;i="4.64,254,1301900400"; d="scan'208";a="543143666" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 22 Apr 2011 09:46:50 -0700 Received: from fedora13-0.dros.org (kkurtz1-lxp.hq.netapp.com [10.58.49.6]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p3MGklHR001508; Fri, 22 Apr 2011 09:46:49 -0700 (PDT) From: andros@netapp.com To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 1/1] nfsd v4.1 lOCKT clientid field must be ignored Date: Fri, 22 Apr 2011 12:45:59 -0400 Message-Id: <1303490759-2646-2-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1303490759-2646-1-git-send-email-andros@netapp.com> References: <1303490759-2646-1-git-send-email-andros@netapp.com> 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, 22 Apr 2011 16:46:52 +0000 (UTC) From: Andy Adamson RFC 5661 Section 18.11.3 The clientid field of the owner MAY be set to any value by the client and MUST be ignored by the server. The reason the server MUST ignore the clientid field is that the server MUST derive the client ID from the session ID from the SEQUENCE operation of the COMPOUND request. Signed-off-by: Andy Adamson --- fs/nfsd/nfs4xdr.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index abdd42d..eb234df 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -591,8 +591,6 @@ nfsd4_decode_lockt(struct nfsd4_compoundargs *argp, struct nfsd4_lockt *lockt) READ_BUF(lockt->lt_owner.len); READMEM(lockt->lt_owner.data, lockt->lt_owner.len); - if (argp->minorversion && !zero_clientid(&lockt->lt_clientid)) - return nfserr_inval; DECODE_TAIL; }