From patchwork Wed Sep 7 18:01:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9319747 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 60C37607D3 for ; Wed, 7 Sep 2016 18:02:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76955293CF for ; Wed, 7 Sep 2016 18:02:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B6E0293E9; Wed, 7 Sep 2016 18:02:01 +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 E6607293DD for ; Wed, 7 Sep 2016 18:01:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935248AbcIGSB6 (ORCPT ); Wed, 7 Sep 2016 14:01:58 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:35922 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933182AbcIGSB5 (ORCPT ); Wed, 7 Sep 2016 14:01:57 -0400 Received: by mail-it0-f65.google.com with SMTP id i184so2146380itf.3 for ; Wed, 07 Sep 2016 11:01:57 -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=fTT2gTj0Fdd2dTSAwmyvhkvTE4b+8sRN57tv+UzJU9Q=; b=UB0UeJhaSULxQObvDRR3Jmlv3Rr5gNrc5tN/BST3GP7B/NJ5IyH/BjtwWWuXX+7Yqq yeCBAYJlx7+X+aDGuOrOP/IGJL1LaImb2qW9iaKrCJk1ahXi4icmollSFAfBcQhHg25B /RFDjzgorhlW1fOLalNpB5xAQ6/7mtke4NbMSafq/ZxYbOZkmaRTmpRID7JqD0CxY1CI APNzk7y8v0iXeM57JIiA8eQ8vHx8NHZeDmygRCDTT4VXvsawjIfs31GxygZ/FBCzR9O8 fhZSm6BgapWw0uCVZm82K+6x8GdNY1anLEOY6sp3zswURwCfqgdmYEzcwo1bZD+rX+je VENg== 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=fTT2gTj0Fdd2dTSAwmyvhkvTE4b+8sRN57tv+UzJU9Q=; b=ZsJmnWbuK0UR+vB1zXX+PwLvbaDroPGwTNc0gz/LyJkDEmS9OToVhZ4N6Tx2WGS2ST AeZOMoUgBItcWz5euiI/c3Qb5TuoyA5/IWo9yg48FWurq2ygdTsBD3kMDpQiG8W17/YJ m5+wUNC5iEZlb88DlnO4Sqvi+1k7kUsnr+BO1FoucIBmUlYLnOC7FI/cToPCCdlVUwfx zeB0aJ5x+UaQL82VoL7sOg7HX/HZAsLA6NLn09AL9CwMbGhX/1Z/jGGrZH9ond9Oh7gc 8gY8uQaTiuTEYYd/oN/AgImgJChAX+R3Fp8dUogPbn9nAVt2KvWUhDAHMX5HFUWTH3Q2 Ui0Q== X-Gm-Message-State: AE9vXwO2EQt8Vm8IpJTe0fmajZFr1ThlBMvZFAakA/blsO4ikjBPI4Eo5Jl7jJzEDbfYDw== X-Received: by 10.36.223.196 with SMTP id r187mr8909093itg.2.1473271316764; Wed, 07 Sep 2016 11:01:56 -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 v7sm3626003ita.9.2016.09.07.11.01.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Sep 2016 11:01:56 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/7] NFSv4.1: Allow test_stateid to handle session errors without waiting Date: Wed, 7 Sep 2016 14:01:22 -0400 Message-Id: <1473271287-43478-3-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473271287-43478-2-git-send-email-trond.myklebust@primarydata.com> References: <1473271287-43478-1-git-send-email-trond.myklebust@primarydata.com> <1473271287-43478-2-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 the server crashes while we're testing stateids for validity, then we want to initiate session recovery. Usually, we will be calling from a state manager thread, though, so we don't really want to wait. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 2728ef288a0f..f1f5d0f10a6e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8587,6 +8587,23 @@ static int _nfs41_test_stateid(struct nfs_server *server, return -res.status; } +static void nfs4_handle_delay_or_session_error(struct nfs_server *server, + int err, struct nfs4_exception *exception) +{ + exception->retry = 0; + switch(err) { + case -NFS4ERR_DELAY: + nfs4_handle_exception(server, err, exception); + break; + case -NFS4ERR_BADSESSION: + case -NFS4ERR_BADSLOT: + case -NFS4ERR_BAD_HIGH_SLOT: + case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: + case -NFS4ERR_DEADSESSION: + nfs4_do_handle_exception(server, err, exception); + } +} + /** * nfs41_test_stateid - perform a TEST_STATEID operation * @@ -8606,9 +8623,7 @@ static int nfs41_test_stateid(struct nfs_server *server, int err; do { err = _nfs41_test_stateid(server, stateid, cred); - if (err != -NFS4ERR_DELAY) - break; - nfs4_handle_exception(server, err, &exception); + nfs4_handle_delay_or_session_error(server, err, &exception); } while (exception.retry); return err; }