From patchwork Thu Sep 22 17:39:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9346017 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 3EB40607D0 for ; Thu, 22 Sep 2016 17:40:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 389CE2AC07 for ; Thu, 22 Sep 2016 17:40:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CD2D2AC0B; Thu, 22 Sep 2016 17:40:09 +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 7DCD72AC07 for ; Thu, 22 Sep 2016 17:40:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965906AbcIVRj7 (ORCPT ); Thu, 22 Sep 2016 13:39:59 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:33119 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965808AbcIVRjv (ORCPT ); Thu, 22 Sep 2016 13:39:51 -0400 Received: by mail-io0-f195.google.com with SMTP id r145so5603774ior.0 for ; Thu, 22 Sep 2016 10:39:51 -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=Dgc6TLBOIuHI3oJQysih2qmvtHs7HwAYDQIBxu8Ph8A=; b=vrYLU9uZ8/gSnplTJxdwisKUqGZvxtLaZ70xolvKq/XV3i3jhiGlx1MXmPVjwtgt4P XFXbHZVE/MrDxK68VqIEdOIOX/2DwjZd0OLu5nbjQVcNB2Hx/TNkGoOONkpzMMq9yRQ3 8ZvNLhq0pRyf/LQmrTlrQvVUNi8xxT5pFkYOgeNABl7H7BQopocCfn7tLm0wivWPYfCa oDYhj0Nt2PMeVG7Ba3Zdd0a0/t6LqXCBDoLfw3TqZ2Cg/iI1SdqkxGr6TrHGiLUUwQmE DcoAn69qEbDoO7itzYeS+BCA1FRZvfeJVQJAVu/03CQWYbNwFGw294lrMSxjKbXJayUT IE3A== 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=Dgc6TLBOIuHI3oJQysih2qmvtHs7HwAYDQIBxu8Ph8A=; b=JfOwfaB3f1QK44iuPMWHbrIgGqdx4oLiotzT3+b0m4J/C4KMs4t6LBsisfCuydWgSp xL0SZVJUdQpXyDnKVi5weAZ1FT31GRL1myOoXWGB6cSkg5Ca26lv19feuypX1EAUMZSf S93zGm0xHj3nRIl7PEZjWqYWgWzjDMMSZAWxUiDAt4s8/V+Lxdpk5v5sxA+qKubo78kl fSFaJ5m5Nae88QVmuSDCSMdgR35tgIyg+GkbPMZdYvlHHRrlkHPL+K7cXIU9rkR5tm/P lkRGzyXgA1Zn78yJGmNOwZME78tLHL4+axT7tcfpKx7w+NrhlDX60Wf6cgDUTcawh/7C LOzA== X-Gm-Message-State: AE9vXwM1dJ9g8II8DQJRqy/hUFVzwf9WJrWnyqZH1mb3fuwjnsMK3W5AkPi5Ltldgipiqg== X-Received: by 10.107.130.156 with SMTP id m28mr4374108ioi.46.1474565990576; Thu, 22 Sep 2016 10:39:50 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-108-86-94.adr01.mskg.mi.frontiernet.net. [50.108.86.94]) by smtp.gmail.com with ESMTPSA id e66sm1194267itd.22.2016.09.22.10.39.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:39:49 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 16/31] NFSv4: Ensure we don't re-test revoked and freed stateids Date: Thu, 22 Sep 2016 13:39:06 -0400 Message-Id: <1474565961-21303-17-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-16-git-send-email-trond.myklebust@primarydata.com> References: <1474565961-21303-1-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-2-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-3-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-4-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-5-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-6-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-7-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-8-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-9-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-10-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-11-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-12-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-13-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-14-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-15-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-16-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 This fixes a potential infinite loop in nfs_reap_expired_delegations. Signed-off-by: Trond Myklebust --- fs/nfs/delegation.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 0ffead281555..484f14700108 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -656,6 +656,7 @@ static void nfs_mark_delegation_revoked(struct nfs_server *server, struct nfs_delegation *delegation) { set_bit(NFS_DELEGATION_REVOKED, &delegation->flags); + delegation->stateid.type = NFS4_INVALID_STATEID_TYPE; nfs_mark_return_delegation(server, delegation); } @@ -894,6 +895,8 @@ static inline bool nfs4_server_rebooted(const struct nfs_client *clp) static void nfs_mark_test_expired_delegation(struct nfs_server *server, struct nfs_delegation *delegation) { + if (delegation->stateid.type == NFS4_INVALID_STATEID_TYPE) + return; clear_bit(NFS_DELEGATION_NEED_RECLAIM, &delegation->flags); set_bit(NFS_DELEGATION_TEST_EXPIRED, &delegation->flags); set_bit(NFS4CLNT_DELEGATION_EXPIRED, &server->nfs_client->cl_state);