From patchwork Tue Sep 20 16:55:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342115 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 5D337607D0 for ; Tue, 20 Sep 2016 16:56:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F40629495 for ; Tue, 20 Sep 2016 16:56:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 442572996E; Tue, 20 Sep 2016 16:56:26 +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 E946729495 for ; Tue, 20 Sep 2016 16:56:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755514AbcITQ4Z (ORCPT ); Tue, 20 Sep 2016 12:56:25 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:36338 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753999AbcITQ4Y (ORCPT ); Tue, 20 Sep 2016 12:56:24 -0400 Received: by mail-qt0-f194.google.com with SMTP id 11so721939qtc.3 for ; Tue, 20 Sep 2016 09:56:23 -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=pEgKg3hZFI8ws93/dhObVIEh7AqiKqtMNn/QbQgbMko=; b=gL30OYwX9xfGQpb3lQE4jryUQK6xtUXKU5H/KSZMRZ7ZogmHJLhECRINUEuIqCaqlT IFEZ2xwW5S2YR8oTEe/a4ex27Lx336YUusIZDCIMNZ+Z9urDXfWgNT1c9dU8Cqm6dV1S 0xJsxH8jeHbrLiExjZgvNax/vZ3tE8kTR3+FG0pp8dSXkqA7ADW2QeBraGij+55Qixta LONT5+yfgtOkvFGBxzVSh7IdI4z+HZS09PDKVMU9Aul3oZ3pwInvn7zAGZWoIHd2mQac 2vpOEfgV/ebm2uroCpwsOF73pCLKdqsAPukBBOf55nTuT3o3NxAA3au3NP0XAE67Zq3B KU2w== 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=pEgKg3hZFI8ws93/dhObVIEh7AqiKqtMNn/QbQgbMko=; b=mqs3H66yjg7CpkUiVZK93KYblJbtIk+XgS1qbPI92G+TTwuq+KCPhERUxVzL5/YgU1 x604hJUBU1p8DozoaVdFWx79qXhtLrk8LPL/H3ydDG0o0yHEH5tGx0M94dlhIpPIFl0t NNdxQGIDqnXMZGShS33kTgMZvdHlC+VEDWw0jjHe7Z8/EElB2Zs9e5D4QQNyktBcS+o7 WPEAFR4Eo7SBawghKdzutyEwVBVL0tWKxrKA21swaCLuU0CG49Q7GrSldJJtfD0I6BHt yAtW0YjhRDXtm3FlJc5LyZsgNkLZmskoUR+0EPGyRBe8Fkr6PjSimuwBcAY/+C1C1lW2 grdg== X-Gm-Message-State: AE9vXwPUnC/qEyPm6G60aGdTis4lWhTLIjKvVK+mM9jpPVL/ZQ9mY/ZPLzvIje0WyXsrPA== X-Received: by 10.200.45.220 with SMTP id q28mr36787685qta.108.1474390583440; Tue, 20 Sep 2016 09:56:23 -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 i4sm16537202qte.40.2016.09.20.09.56.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 09:56:22 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v6 06/29] NFSv4.1: Allow test_stateid to handle session errors without waiting Date: Tue, 20 Sep 2016 12:55:48 -0400 Message-Id: <1474390571-17106-7-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474390571-17106-6-git-send-email-trond.myklebust@primarydata.com> References: <1474390571-17106-1-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-2-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-3-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-4-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-5-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-6-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 a026156434ae..2b569d5fb3e2 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8598,6 +8598,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 * @@ -8617,9 +8634,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; }