From patchwork Thu Sep 15 16:45:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9334265 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1AF09601C2 for ; Thu, 15 Sep 2016 16:46:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10C0229A79 for ; Thu, 15 Sep 2016 16:46:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 055DF29A7C; Thu, 15 Sep 2016 16:46:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CD1C29A79 for ; Thu, 15 Sep 2016 16:46:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752627AbcIOQqI (ORCPT ); Thu, 15 Sep 2016 12:46:08 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:35160 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbcIOQqH (ORCPT ); Thu, 15 Sep 2016 12:46:07 -0400 Received: by mail-it0-f68.google.com with SMTP id e20so4991548itc.2 for ; Thu, 15 Sep 2016 09:46:06 -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=YmElvZiASZPAZ+/XhscG+J+R8Rj52lC5KHzeCS4Kbcs=; b=AKiX8Yjny/m7SyDzumlmgg9dDA4OrW04O847AhWIV7PiHzAfu3gAxT1U9dvlNOzxHb gSzOGJvALA0lKUOHpid0CtpWSY4NoYm/Eyk+zokQ+ALwsXNq+IU4TwoF1o/HnQEe7bQs 84GmTXRTcfDh8wlB1A+RKORAAxHgZJf426rBlt4T8z+lptwfcZixNH9uSVDDg6p0Xm6m x2LKroL3D1uf04E5jkUmOEihjQVPJm6XpN0fzWSy+srFq4pWbY6tRhdzkq1aPoGzzdR/ +jqLl9Zqt5+AEvQAhMXETugsL8SSIYKXTyNr5WVn38I7yhLG/bfYFkNa02Z3Cw9XzMRb 6Amg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=YmElvZiASZPAZ+/XhscG+J+R8Rj52lC5KHzeCS4Kbcs=; b=SKu37E8v1AU/nKUYHS69/DZJMFF02jdlqC+47VoM/gp+nTmrZtDUGb9JM+tak2Se8x 2ROzr8ydWPt1cuCHqUIQJDd3krR2ygoaGoVBs3/yTuWDLp0OclmUDoIJ+vL2DZEwlvvh 7jkiLdjetQ5xZCaOPeikmUW7rke41T0xji5Wgen5kAUELERTqsevIRW29oc2BBum6/7o m3csOdjbl46FIbIHivz8+BADvFTkYruU3UCLd9JDFi9BdEopubH60SPXSbPCrEgR1GTD USBy87QRj2Fwru+E8zhpHX6lyaLIKgMTI2DGCkWFA72jX3E4iChGEjtZDWE962y4VkJx 81zw== X-Gm-Message-State: AE9vXwMmLx+BmEs9OtdNUVdFoNAqm1mTqiBAaXVibyGCZpFVkiq6sfAmhHvm4m5A/yDjaQ== X-Received: by 10.36.29.14 with SMTP id 14mr554930itj.87.1473957966452; Thu, 15 Sep 2016 09:46:06 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id y132sm1248687itc.20.2016.09.15.09.46.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Sep 2016 09:46:05 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v4 02/20] NFSv4.1: Don't check delegations that are already marked as revoked Date: Thu, 15 Sep 2016 12:45:42 -0400 Message-Id: <1473957960-10001-3-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473957960-10001-2-git-send-email-trond.myklebust@primarydata.com> References: <1473957960-10001-1-git-send-email-trond.myklebust@primarydata.com> <1473957960-10001-2-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the delegation has been marked as revoked, we don't have to test it, because we should already have called FREE_STATEID on it. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6b700c59eede..a026156434ae 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2423,6 +2423,11 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state) rcu_read_unlock(); return; } + if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) { + rcu_read_unlock(); + nfs_finish_clear_delegation_stateid(state); + return; + } nfs4_stateid_copy(&stateid, &delegation->stateid); cred = get_rpccred(delegation->cred);