From patchwork Thu Sep 22 17:39:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9346005 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 6B967607D0 for ; Thu, 22 Sep 2016 17:39:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6539C2ABFE for ; Thu, 22 Sep 2016 17:39:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A01F2AC04; Thu, 22 Sep 2016 17:39:50 +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 CC2C82ABFE for ; Thu, 22 Sep 2016 17:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965761AbcIVRjs (ORCPT ); Thu, 22 Sep 2016 13:39:48 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:35643 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965884AbcIVRjn (ORCPT ); Thu, 22 Sep 2016 13:39:43 -0400 Received: by mail-it0-f66.google.com with SMTP id e20so5326145itc.2 for ; Thu, 22 Sep 2016 10:39:43 -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=ZfzxlTwgZKuC1TgbUu/zN8LgLTd9C7uEQNJBU79d5KxpLmPerRZwcdgYEC5H0cDJ6s nbmINBAKv/Y7FZyjzMuWVY0Tyr7IIIpfoc/dnlf9dpaD7hHEFnYflI8/HvX/JxrVPFez dfW6/ZkSpXM0OMgpFrmCagqLaoJK52qGf9vu8A5U1oSDRdTl21/3htfpwRirQJ5kf7El AAjx8vzKOfE0dwNZtObMQbCsI3/m0bTVj199lIzYkeLdBMvlzCCqV9wp3FgctztYdAi/ aEQ+80R9DndvwvAShjsVY0Gkq04fwcEkt0yrfbCkQ01TidtQ2sGwRqBD3z6X/5TQ4MI8 qo1w== 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=Z8o6bDPU+fzW0/nzIt4trWqWoDYz9m8cbx8ICp5uCpv90REIJ7C0oq/pr2NyhHPT3J 00F5xnqFHOCgfAmjohP0YkB32Ms+CYEFPMHrtX1jBkVNmVadxLuwgw226XfdPVCIJPv9 GDa+skdIyGtxBVh+LSMZUMANVu6XTiZBAN5PCJh+GN06RNNXW0AX5/v2VyU/ttgG1c4O lY7yhD7T4LFbEBQi9ix5n0ZBPALH6os+I0LR37RE7krlLRemB76BLajfURgs2sGZiXX9 6kqIY/VqgQxs7qITVkji8FeJ9nCGBOjKUshWBGOaPt0PZcZTgoHwntnuGgX+TN2BfBUG fC5w== X-Gm-Message-State: AE9vXwOEZ0z6YlcGMrqMPe545tk1lgMHSAsfZ39ryclUhU0PoyWIdYSncnF0/jn1TKGAlA== X-Received: by 10.36.101.65 with SMTP id u62mr4389034itb.45.1474565982639; Thu, 22 Sep 2016 10:39:42 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:39:42 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 10/31] NFSv4.1: Deal with server reboots during delegation expiration recovery Date: Thu, 22 Sep 2016 13:39:00 -0400 Message-Id: <1474565961-21303-11-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-10-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> 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;