From patchwork Thu Sep 26 18:40:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benny Halevy X-Patchwork-Id: 2950231 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E1C73BFF0B for ; Thu, 26 Sep 2013 18:41:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC220202E5 for ; Thu, 26 Sep 2013 18:41:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54A262017B for ; Thu, 26 Sep 2013 18:41:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753947Ab3IZSlA (ORCPT ); Thu, 26 Sep 2013 14:41:00 -0400 Received: from mail-qc0-f181.google.com ([209.85.216.181]:39040 "EHLO mail-qc0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753078Ab3IZSlA (ORCPT ); Thu, 26 Sep 2013 14:41:00 -0400 Received: by mail-qc0-f181.google.com with SMTP id q4so1026439qcx.40 for ; Thu, 26 Sep 2013 11:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JjgOe4+Wev6nV2CDXZE84w3HQ7iAgoQC/ttk3lbbYCM=; b=EU1yTRRpoLaueNWyYEuSRoBCZBL4efZNJu4rFwiKS3ycCJySYC4rCENOhkpnJOSR+2 J9LCshdGU0aRnaq2vD8ztauyikrnYxUWDp4XhYYs2Vh06vl4IG2+R+Hgy3vSbv1pBTP6 tDmYexnNP+YEbCg9TdRdh2xBnXG+qc3SkLLjCK6YmrLA+OQY3mRcEgIZ0TLsD1Uhu+CS Kn6bAh7zirmyXtS3zAGifWhO2/DHkRYFeR2kl2b1LyMFOEgEMChD3crPDwCZltG1iaiR D1SSj8Bp61rf6DIE5LePsfqT1xFz9wpwdgKb2EA+3Azv2sQ2LMLpwdhDfOsqcJHba5W6 s+0w== X-Received: by 10.224.92.81 with SMTP id q17mr8565561qam.92.1380220859529; Thu, 26 Sep 2013 11:40:59 -0700 (PDT) Received: from bhalevy-lt.il.tonian.com.com (nat-pool-bos-u.redhat.com. [66.187.233.207]) by mx.google.com with ESMTPSA id l4sm1939574qae.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Sep 2013 11:40:58 -0700 (PDT) From: Benny Halevy To: " J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC v0 16/49] pnfsd: accept all ds stateids Date: Thu, 26 Sep 2013 14:40:57 -0400 Message-Id: <1380220857-13416-1-git-send-email-bhalevy@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <52447EA0.7070004@primarydata.com> References: <52447EA0.7070004@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Adamson Until a stateid protocol is implemented, remove all checking on file layout data server stateids. These are idetified by the current fh type. Signed-off-by: Andy Adamson [remove #ifdef around pnfs_fh_is_ds] Signed-off-by: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfsd/nfs4state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 2c973e6..b80807c 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3648,6 +3648,9 @@ static __be32 nfsd4_lookup_stateid(stateid_t *stateid, unsigned char typemask, if (grace_disallows_io(net, ino)) return nfserr_grace; + if (pnfs_fh_is_ds(¤t_fh->fh_handle)) + return 0; + if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) return check_special_stateids(net, current_fh, stateid, flags);