From patchwork Sat Sep 17 05:13:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336981 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 CA7CE6077F for ; Sat, 17 Sep 2016 05:13:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEA3929FBE for ; Sat, 17 Sep 2016 05:13:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B367D29FCF; Sat, 17 Sep 2016 05:13:53 +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 6612829FBE for ; Sat, 17 Sep 2016 05:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755337AbcIQFNw (ORCPT ); Sat, 17 Sep 2016 01:13:52 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:35878 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755046AbcIQFNt (ORCPT ); Sat, 17 Sep 2016 01:13:49 -0400 Received: by mail-io0-f194.google.com with SMTP id z135so2380200ioe.3 for ; Fri, 16 Sep 2016 22:13:49 -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=gPw4YfpBduYCd4UUKz71zPCFPpqH8R5Cv4dMRP6q5RM=; b=YlrS+1t/dQjUcl5PUTfEBG1ROYmp/nqbVmzkRdyg3z7UhJJeZ5fI1D8xG1Di8qfd2R pH2cZOKAH/88p+VJd411sppiGGmgqazT2aujBBd6wasdL6MCEpVvggSJHDe4RMnjQhnY vImV2rITd4YYzkvOjxgjHG4tlRMGzIEkpfHwQHu+j/OQqEKojNIF91XE+XWgFSdiB2Ho jDg7E4fgYoV15HFSS55COmNXPyJ4BEFwEYIL4603IAVxMIA5XkYHuyFFWeBOmrpACOPw 8VlFkyObLROxny054rh4WV5ij18UEBBHsx0KI7ejiep0vP8G3DNa1zuPizJYdAP6RG13 Ad2w== 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=gPw4YfpBduYCd4UUKz71zPCFPpqH8R5Cv4dMRP6q5RM=; b=FxNM6jB+yxCPxioeaUZD0/IaTEnrr72DiZiP6IMO+xJg//EboIistqUMpprq3KKKo/ 13QML9MRgavCZoX+zSvmBE2OvnbcbzEt3Ax2UhRjYkKwBFTCNbl0weQbf3UShuGieXtE kwKhnRPDt/5cG/NhIRxUeOSEBob+Z/mUplvhI6cJzST1bTcGZHtv2GqVftgLLkpZ7HPd yMq6j191i3lnczhRRGKnrvhYgZAzxQc0IHIdlFxjNmoRiml0zbVy45luFZf22B6zNe77 nRU06rCrNmn5yXqUsIjkaIauYW+HMzyNGH5DBWljpu7EKtTAkR5ApyBSWCM7JYrfP65v t4HQ== X-Gm-Message-State: AE9vXwMVRIqg6Go6W7dkwnu/SZFBgyJAvoOtKG43xSCoOmOMzQarZRC8EHd5A/miEBj4IA== X-Received: by 10.107.59.71 with SMTP id i68mr2002876ioa.92.1474089228921; Fri, 16 Sep 2016 22:13:48 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:48 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 14/25] NFSv4: Ensure we don't re-test revoked and freed stateids Date: Sat, 17 Sep 2016 01:13:22 -0400 Message-Id: <1474089213-104014-15-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-14-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> <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-5-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-6-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-7-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-8-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-9-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-10-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-11-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-12-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-13-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-14-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 f431fde13e90..34aa5dfbe99e 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -647,6 +647,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); } @@ -885,6 +886,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);