From patchwork Tue Sep 20 16:55:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342123 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 E23E2607D0 for ; Tue, 20 Sep 2016 16:56:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D410929495 for ; Tue, 20 Sep 2016 16:56:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8EF529979; Tue, 20 Sep 2016 16:56:32 +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 678B629495 for ; Tue, 20 Sep 2016 16:56:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755542AbcITQ4b (ORCPT ); Tue, 20 Sep 2016 12:56:31 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:33893 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753999AbcITQ4a (ORCPT ); Tue, 20 Sep 2016 12:56:30 -0400 Received: by mail-qk0-f196.google.com with SMTP id b204so1439545qkc.1 for ; Tue, 20 Sep 2016 09:56:30 -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=RTTZZq+D6h92jfLDNCX8p5Owu3goG/PYF1o4imML2SQ=; b=LDF43xk5CYmSclTP3IL0zi1xrAFnzr8Z6thHZBZwVc72TaTC8Wj7jCu6fJXm4qvwWF PKwUljYEH88mOMCJy2R+8ZvlOFxN+wHvBKq1zQVdgbycMcyz5iL1hbpRC6lOrnKwhrQF rrvPH/Z6lVri6upbiyFc4c+PkHlq4VdKE90jmoDqP9oBr+IJVdLxJf1yiC5TPlmSrJjY 2zvQpi6kA0iM/56gcrJjV+00bcN97GVhBxFC4+72rSuN5ZHV7Senq49Ur8HbDu6BbCdj FZaG57EYTFYwE/SR3IEO8zi77syKq2iqnsBCRwRUarLjx0mIH2Ii4Z+LqKhNfCDnFtF1 wzww== 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=RTTZZq+D6h92jfLDNCX8p5Owu3goG/PYF1o4imML2SQ=; b=az2b1HdYc3+wYeSul2BWcs4Tjb/a2GQlRSplzyu7PXjiAeFafsJ9xDT+54h6+ukrp+ /Dz6bEU9Xwpokp3jpiPxmCkBXxM7lFFwbPfqZbtdxsIwtlf0n8Q21f9EqvA/AkUFWoW1 LvsKcOUpmOoJmIAkKFJ8Hzq0Yc1XDWGoCWzCNDkUnXWTUqXQZ2cS/5vBHRzjLNGxiADp YZ0vqj10enAB2EUpKZC6cMUfYEOc53K+8ch9XsR54cnFmQ1mwmTpIJK+0aOq2LzU51c5 FxojaiKNNFsvaW7ak5dp+bEqITz5psWEBJ1aHUsQ6YuGkVibBwF+BXYsj1KgVLN5IZ92 PVkg== X-Gm-Message-State: AE9vXwOCOsCPzalfFRSeHjp7Bp2k6Uw4Vpw6SHOHTHKCAP3ZMhQy7trnjfXW1CC7DSCH4w== X-Received: by 10.233.235.208 with SMTP id b199mr34525862qkg.287.1474390589849; Tue, 20 Sep 2016 09:56:29 -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 i4sm16537202qte.40.2016.09.20.09.56.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 09:56:29 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v6 10/29] NFSv4.1: Deal with server reboots during delegation expiration recovery Date: Tue, 20 Sep 2016 12:55:52 -0400 Message-Id: <1474390571-17106-11-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474390571-17106-10-git-send-email-trond.myklebust@primarydata.com> References: <1474390571-17106-1-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-2-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-3-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-4-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-5-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-6-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-7-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-8-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-9-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-10-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 Ensure that if the server reboots while we're testing and recovering from revoked delegations, we exit to allow the state manager to handle matters. Signed-off-by: Trond Myklebust --- fs/nfs/delegation.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index dfb300901f7e..0ffead281555 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -884,6 +884,13 @@ restart: rcu_read_unlock(); } +static inline bool nfs4_server_rebooted(const struct nfs_client *clp) +{ + return (clp->cl_state & (BIT(NFS4CLNT_CHECK_LEASE) | + BIT(NFS4CLNT_LEASE_EXPIRED) | + BIT(NFS4CLNT_SESSION_RESET))) != 0; +} + static void nfs_mark_test_expired_delegation(struct nfs_server *server, struct nfs_delegation *delegation) { @@ -892,6 +899,19 @@ static void nfs_mark_test_expired_delegation(struct nfs_server *server, set_bit(NFS4CLNT_DELEGATION_EXPIRED, &server->nfs_client->cl_state); } +static void nfs_inode_mark_test_expired_delegation(struct nfs_server *server, + struct inode *inode) +{ + struct nfs_delegation *delegation; + + rcu_read_lock(); + delegation = rcu_dereference(NFS_I(inode)->delegation); + if (delegation) + nfs_mark_test_expired_delegation(server, delegation); + rcu_read_unlock(); + +} + static void nfs_delegation_mark_test_expired_server(struct nfs_server *server) { struct nfs_delegation *delegation; @@ -964,6 +984,12 @@ restart: nfs_inode_find_state_and_recover(inode, &stateid); } put_rpccred(cred); + if (nfs4_server_rebooted(clp)) { + nfs_inode_mark_test_expired_delegation(server,inode); + iput(inode); + nfs_sb_deactive(server->super); + return; + } iput(inode); nfs_sb_deactive(server->super); goto restart;