From patchwork Thu Sep 22 17:39:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9346041 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 501B7607D0 for ; Thu, 22 Sep 2016 17:40:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A9B528580 for ; Thu, 22 Sep 2016 17:40:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F8F12ABF3; Thu, 22 Sep 2016 17:40:21 +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 E0F0428580 for ; Thu, 22 Sep 2016 17:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965078AbcIVRkT (ORCPT ); Thu, 22 Sep 2016 13:40:19 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:35705 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965911AbcIVRkH (ORCPT ); Thu, 22 Sep 2016 13:40:07 -0400 Received: by mail-it0-f67.google.com with SMTP id e20so5326537itc.2 for ; Thu, 22 Sep 2016 10:40:06 -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=eJjGYNWSsZ+CfhmsQtAvRURbJIZExO4HS8Y1rjUnBP4=; b=BNXg2mtxhxu3+APrucHdUbEW9vuuTHstMBl+6/vSiZ8BLc5Jv3A7E/p+7Lob5HIk3B MI7BQo91xRvqNtppeUHtccajc2NHVpmiWFYbblMuDS01OXBpLrfDuQ83rBe5/LdEdcKT oOAs4sA3JMGIi8W8iaeNajNbA1dkOrgM2YlqCLnwQwGivqELgsjFVEJ3LjADkVytUq1S f7iT5WtnArvGDbwKG7s3cjaQhv1WDMC3huRE88GG+Gte3Kh8wXODCmQK5hBEnywx79zJ ATID7Ak9SDr3rStDOiGe4fJ42Z91fN63KrWhwPNbyHaMfDEfymf+9e4B6b2LbqL94n4i R40g== 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=eJjGYNWSsZ+CfhmsQtAvRURbJIZExO4HS8Y1rjUnBP4=; b=b9SULP1D5YfGCVdMhnTsvjY6bM4UPY1sur2961bjiWvz8SbfCt9LsQdJhqaNpxcHkr LPT6GjApjZcx2NOi0mJfEdylLjzsuzns0BGJsgIUxv4CP33sLWIwtD1zB725h7ZHL8M5 poRh/OO/I1pFuJrd6vebcCo6b/9fs6tmYHW0IVjfuJIItwBml3O+Or9DAN7NaSTPLiFL a4tasr1qqZ6i5E4Oc456NvAj59YUMKyN3+HBt9Be0ptJzSjNrks45dzekWhfvORSdDSn Nbeev2wVcavaEnRzaVUJQfL9O5dQp8jPp9FjdRHRVGDkZ5Smcn5aNmNfIQMCqg8d5651 5tEg== X-Gm-Message-State: AE9vXwODOwroKfWi+WXF7YMhrIuf/6jJxudX+a7oMUcbOjBJPnvoeWCKYFqflrhrl504gQ== X-Received: by 10.36.129.213 with SMTP id q204mr12510112itd.38.1474566001161; Thu, 22 Sep 2016 10:40:01 -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.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:40:00 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 25/31] NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid Date: Thu, 22 Sep 2016 13:39:15 -0400 Message-Id: <1474565961-21303-26-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-25-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> <1474565961-21303-11-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-12-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-13-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-14-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-15-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-16-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-17-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-18-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-19-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-20-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-21-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-22-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-23-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-24-git-send-email-trond.myklebust@primarydata.com> <1474565961-21303-25-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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 338684195e95..552bea2af811 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -397,13 +397,23 @@ static int nfs4_do_handle_exception(struct nfs_server *server, exception->delay = 0; exception->recovering = 0; exception->retry = 0; + + if (stateid == NULL && state != NULL) + stateid = &state->stateid; + 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_state_and_recover(inode, + stateid); + goto wait_on_recovery; + } + case -NFS4ERR_OPENMODE: if (inode) { int err; @@ -422,12 +432,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);