From patchwork Sat Sep 17 05:13:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336957 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 853FC608A0 for ; Sat, 17 Sep 2016 05:13:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76C7829FBE for ; Sat, 17 Sep 2016 05:13:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B42129FD2; Sat, 17 Sep 2016 05:13:43 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 D5CD229FD2 for ; Sat, 17 Sep 2016 05:13:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754757AbcIQFNk (ORCPT ); Sat, 17 Sep 2016 01:13:40 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:35864 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753765AbcIQFNj (ORCPT ); Sat, 17 Sep 2016 01:13:39 -0400 Received: by mail-io0-f196.google.com with SMTP id z135so2380102ioe.3 for ; Fri, 16 Sep 2016 22:13:39 -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=kZgSH1PUPek02VSta/oCuC+JOXHJ7hwJxlza9DIFHUWl/2WNoR5By0TYBkf6okpsRJ mqqysIDVMID8tuxaBEOV/WyxYFgXrIbuzJ/Y6GhOa53Xd94SV8LcGS/ZguLBmdscwRVr 5QGKIZfLta5L3DAUBc30BnzH/s50wWjSCd0vF0eXyhmj3DNgZBfKzVh/NYFPREtRaodS d3E99v2xhRG3Jp+M9+j7ql16bEW0P6oq3OGjPc/SO1UmNoK3X/pYLSYqMgJjBDor3kVc E644UIrigck0/qVNAO7qr8kQihx5supfM6qLT+UmrMFJfCWsVEAOd2pmsQhIVqME7bbc IhQA== 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=ZL+dEzo9YxYuXJGm35aZcRMgex08mI3eD0Y+hPe7v/Ih2sR6nWPt5vzkX8noolJWoZ +nZoPJC7h26ONDM70U1FfZXDxbSGM2muZ9PY+if8MiwgjhbKhUSW/vVu6lC3u2T0tlDu rTViFeKqxxIa2ffkETs9KwY2/EyiVJAUhGkbCu3JE254Sdmw2C8R1XAZdXVzF9ty8CXp szHlmMIkweLpKFimj5mDxMbEtsv9kh1g5Jlr7FBhycNgO0mUs6teL7DJ6sPrODlzINf0 oueR339BUQRyxrg9K2pGNmxG2hfLQtSqYHmAfOMnicatHee8xyj4XfFXnuyvmSoC4/u2 KLtQ== X-Gm-Message-State: AE9vXwMGCTTFs5WoXsO56pvcHmk0HA8unuR8aiZdem3zzq5bNKxxmaSAm8qf4EMgS6xEPw== X-Received: by 10.107.158.213 with SMTP id h204mr27064759ioe.75.1474089218732; Fri, 16 Sep 2016 22:13:38 -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 d15sm4993916ioj.19.2016.09.16.22.13.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:38 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 03/25] NFSv4.1: Don't check delegations that are already marked as revoked Date: Sat, 17 Sep 2016 01:13:11 -0400 Message-Id: <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-3-git-send-email-trond.myklebust@primarydata.com> References: <1474089213-104014-1-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-2-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-3-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);