From patchwork Fri Sep 9 18:04:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9324083 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 2BA2960752 for ; Fri, 9 Sep 2016 18:04:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2295329F98 for ; Fri, 9 Sep 2016 18:04:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1775329F9A; Fri, 9 Sep 2016 18:04:54 +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=-4.4 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 A7B8129F9E for ; Fri, 9 Sep 2016 18:04:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754260AbcIISEw (ORCPT ); Fri, 9 Sep 2016 14:04:52 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:36163 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752196AbcIISEu (ORCPT ); Fri, 9 Sep 2016 14:04:50 -0400 Received: by mail-oi0-f67.google.com with SMTP id s71so8338326oih.3 for ; Fri, 09 Sep 2016 11:04:50 -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=OkNrZM0/ee3TuxCMDBkZC7VJSY7lD+NJ8YR5Ppka9RA=; b=yiSNGnPQ1a0AxJaqYQYUS6N7UeCMyYMMh5wJ/A4EWQDUAAJ6TqNyC16NWhEf+kvW0X HITaDWRcwgJFb36b19QaC2rulj8fQ+Zc1IZXvWWtGnq8/e16tIVg2Px8NLFSZz/kAutF /JK7MpAJZuQpp4lDnI3TomNWCS6OdV9MsS9sfkX5KbWN++gwJkhJVZXGxzn018ELbz/Y 1JLacMJJgg1wnaoKcFbfLYIlttNmUqAQZLaD0UePgWQT1lpw/XEYcdJfwPVKykul+PoW 3dIDaBc3SrUFiwKGnT85BmzZzCGQ+R2msmF98nsFGq+0beXbix7ZaazGxsha6DoKtUbK 79gA== 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=OkNrZM0/ee3TuxCMDBkZC7VJSY7lD+NJ8YR5Ppka9RA=; b=Cn7Vwgy1EinH2roG5wj1eUQJECRdC24BRE2Zbbj2dVq9vusRU2jMDMXpBxavyNBozn 4cFFv+g3y18MWIzt8xx/1nPDSzAxPQS+YOJ8sL2/m/RsAyOh4u5q7cuuG4sJe0Dm8S+b nW8nqtHfc6NHrvxW3sWKZXPId7CpAXztzfP/TH47+aJDQJ36t+r/ZlsxOd51S1DhCfAy vb1sNwHvwHiSw+GHMYDOGEtvQX3wYKbpSwiZrSyzuGHNDKAMTHlwMxnItczPJIcbpNBw mpITJ7JoxEcGYyR4SCm7IsB8cZn4YvFHKXAitrjzfHPjrmdoQ5aX3kieKyVpxVkkYtSV ZXig== X-Gm-Message-State: AE9vXwNi82HWl4ElA7DGX18XutH7M7E57bC8FhvRoxRWrTPGcX0pQy+UW6HZ9NMmt9eCOw== X-Received: by 10.157.27.132 with SMTP id z4mr6610112otd.82.1473444289948; Fri, 09 Sep 2016 11:04:49 -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 r200sm1925797itc.13.2016.09.09.11.04.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 11:04:49 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Cc: Oleg Drokin Subject: [PATCH v3 07/12] NFSv4.1: Deal with server reboots during delegation expiration recovery Date: Fri, 9 Sep 2016 14:04:08 -0400 Message-Id: <1473444253-12433-8-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473444253-12433-7-git-send-email-trond.myklebust@primarydata.com> References: <1473444253-12433-1-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-2-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-3-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-4-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-5-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-6-git-send-email-trond.myklebust@primarydata.com> <1473444253-12433-7-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 ff0c1a0feb9d..b873271c613a 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -874,6 +874,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) { @@ -882,6 +889,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; @@ -954,6 +974,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;