From patchwork Sat Sep 17 05:13:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336985 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 1C1B16077F for ; Sat, 17 Sep 2016 05:13:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F94429FAD for ; Sat, 17 Sep 2016 05:13:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0493B29FCB; Sat, 17 Sep 2016 05:13:56 +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 A108F29FAD for ; Sat, 17 Sep 2016 05:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753327AbcIQFNy (ORCPT ); Sat, 17 Sep 2016 01:13:54 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:35805 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756486AbcIQFNv (ORCPT ); Sat, 17 Sep 2016 01:13:51 -0400 Received: by mail-it0-f67.google.com with SMTP id e20so1839482itc.2 for ; Fri, 16 Sep 2016 22:13:51 -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=qEDH8HwDG7Ihwy8NWK6ElryVEpBtZQsAZpuyFxp/ovM=; b=NLH5Mwf1oj6D5I/j0OKRqUB+GElraeVbb6ybzopc9QSOUl1mEiJNUp/kNO+3jRLoQF MShg8sgEMhwOcUY/xrpWc/9aXIYeqsCXbKDpvRm2PkzAo1f7IRCEjB6/4R7YGmsVSu/3 H3rynJa2PPyiWcOxP/y0IoRe95GkMI96h4e7ubIZtKJZszh8R2WV944awWOApigOxihY YuiwHwXXGXWeDLi91TtPz1rASpYMplHq2n7K/bLO+skqcfH+SNNk12RNxbZBU2vlej6G u2mf7f0ANNVBQfaMti+h5bAZv9h3abEII5BC43O9I8sOHnChPdOqxkkFvf/TUAdniIVa 38nQ== 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=qEDH8HwDG7Ihwy8NWK6ElryVEpBtZQsAZpuyFxp/ovM=; b=V8psoRFVXkYIbPj2/ocGufZAa2Bt6H+qYRVQ5FE3xzAy5ZjBgxfVKpb8dwhXTXA4j8 SlRKArs7b/sPMz9/8ff7PDsJw+iT/+DuJpMT/K8A8G5kfHzoxE1A6aargKTUs+CjVANc J5OZwUSzQ4pn7PGfXOFDe4VzmQt8tazwBGXbqwmDJ2zu2//uePCIBheLIVJemxH0iw0i Sfiy/jGYSKTiprSVJRANPt66faLQJqYx+GFvFpQ4hyuXkjtr28KHyrZ1qSwibdTPvQRW XK6ZfwJVCcBgn/CG76IKesFm5BaoQJa2hd5BA8xLLIUwk+H2hcS8hHvNlJdGo46i5BHv xsWQ== X-Gm-Message-State: AE9vXwOCoKNN3huKsEg0Lwe1DJ+9U8P27Er9oCTJ5C1qHxEUd9XwoSlxLX89zsZEqCbiGA== X-Received: by 10.36.55.215 with SMTP id r206mr881603itr.110.1474089230642; Fri, 16 Sep 2016 22:13:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:50 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 16/25] NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid Date: Sat, 17 Sep 2016 01:13:24 -0400 Message-Id: <1474089213-104014-17-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-16-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> <1474089213-104014-15-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-16-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 If we're not yet sure that all state has expired or been revoked, we should try to do a minimal recovery on just the one stateid. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index f79d4f55d83f..84ee836a976c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -400,10 +400,16 @@ static int nfs4_do_handle_exception(struct nfs_server *server, switch(errorcode) { case 0: return 0; - case -NFS4ERR_OPENMODE: case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: + case -NFS4ERR_EXPIRED: case -NFS4ERR_BAD_STATEID: + if (inode != NULL && stateid != NULL) { + nfs_inode_find_delegation_state_and_recover(inode, + stateid); + goto wait_on_recovery; + } + case -NFS4ERR_OPENMODE: if (inode) { int err; @@ -422,12 +428,6 @@ static int nfs4_do_handle_exception(struct nfs_server *server, if (ret < 0) break; goto wait_on_recovery; - case -NFS4ERR_EXPIRED: - if (state != NULL) { - ret = nfs4_schedule_stateid_recovery(server, state); - if (ret < 0) - break; - } case -NFS4ERR_STALE_STATEID: case -NFS4ERR_STALE_CLIENTID: nfs4_schedule_lease_recovery(clp);