From patchwork Sat Sep 17 05:13:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336969 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 252976077F for ; Sat, 17 Sep 2016 05:13:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18D8729FBE for ; Sat, 17 Sep 2016 05:13:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DB3829FD2; Sat, 17 Sep 2016 05:13:48 +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 A4C3329FBE for ; Sat, 17 Sep 2016 05:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754387AbcIQFNq (ORCPT ); Sat, 17 Sep 2016 01:13:46 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:35872 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753327AbcIQFNo (ORCPT ); Sat, 17 Sep 2016 01:13:44 -0400 Received: by mail-io0-f196.google.com with SMTP id z135so2380156ioe.3 for ; Fri, 16 Sep 2016 22:13: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=tjouqKyQVHYt0CpChGlEOuclBM1WeJO6JeVr3vpAt1s=; b=mzvPmFA7gDgLAqRvb3Ff552ceDdNw58GGXN6zigLiyhFVF632+eGSemYMdRnLvTUoF s1kVTbsgZEguabHPlNlXBui8vt1JfREAb82cJ6pQW3ftAnRnsyZ+7wD2wznvDcUY762r KkoefdNrCpYH1bNWBDYWzVJ97sX8WviMNBltJw3oPSFxaXSrq/j2ojHpXi+xkGgBjCgY C6HefXr58mfkvVXj4ADez9+Y1GM90OMywEmB7A2Ni50/QBdPtiDfOcEklNqPqsxaIqwR n1AKhRZ5ZJhjImsJ1nm04CKtFtzq43MHcDyMKCHMlc2zIe54CAMqMTGwJkxguavoJmpd pP2Q== 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=tjouqKyQVHYt0CpChGlEOuclBM1WeJO6JeVr3vpAt1s=; b=EdjQCU8sWEb+FNkFn16MP47oEiT1YmxGJBPA/IVlcouwpOG+VFLg1ul9GNfbtb9ToJ RiTsvEFNRYCGdQ2sl9GR2cfzIuXCxxsWCfu0b27QgtAG/hnLSxQUfDfImEdtfOeniG9A ZSJ5PfDLalelUbZoW12+AO4tiFz1KYijqzhMSLg2W2CSf24/aYxN5F4lLF+yxqZdzA7x it3OAGF9N0q9m+tSn917rfvIY7JW9d0hCHJKj0oSVrZIJA6flZQMKNVBUbizxvcX/8Ez 0NajeuHBsqS4h12MkvQi4KsCzilX1qubzc3OSmZNwrkXPXzCKTBMI85Eh1DcKcsdAiI6 zTpw== X-Gm-Message-State: AE9vXwNZXNPuZPmPZ9nD2IEzW52j5EN3C9VZl2EQU2ILmRkX4llHUGgya0UCo4USe/qI8Q== X-Received: by 10.107.39.194 with SMTP id n185mr30965619ion.47.1474089223352; Fri, 16 Sep 2016 22:13:43 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:42 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 08/25] NFSv4.1: Deal with server reboots during delegation expiration recovery Date: Sat, 17 Sep 2016 01:13:16 -0400 Message-Id: <1474089213-104014-9-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-8-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> 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 f0765968a819..f431fde13e90 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -875,6 +875,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) { @@ -883,6 +890,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; @@ -955,6 +975,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;