From patchwork Sat Sep 17 05:13:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336987 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 1C5D26077F for ; Sat, 17 Sep 2016 05:13:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F0F529FAD for ; Sat, 17 Sep 2016 05:13:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03D6429FCB; Sat, 17 Sep 2016 05:13:57 +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 A092129FAD for ; Sat, 17 Sep 2016 05:13:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756711AbcIQFNz (ORCPT ); Sat, 17 Sep 2016 01:13:55 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:33943 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756504AbcIQFNw (ORCPT ); Sat, 17 Sep 2016 01:13:52 -0400 Received: by mail-it0-f67.google.com with SMTP id 186so1845758itf.1 for ; Fri, 16 Sep 2016 22:13:52 -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=TsopxqOvOOzvvfo0UTxFDotQHgADb42ioezYj/InxjU=; b=GwFee6pPH8n40Q0N5IUCelccmQbkD1QauJMcZCidCOXqu1UY7q7rb2wuUbgwbak4y7 WPv75lraGlKxNnyfJem5BKMUDtecSkofPcuvw3nCgqjP+W9yqucVIHIsgJ/ed2kPlWIj yCHGaBvog3Kn+GrLQJufJqvPvA5Q83R9+I4wuw2HYFsj2iscmgwBgWvmQ54m48LXC1J1 kb2DPKUsLdJU5uTIPNMARaZ7tDSEDWtM82aVm7eZ/LwKy+cCqoG7eNT9mPG/x0hIBF22 0CvzvIZWbHoz0BLtds8mhVO7BTbIzyY6gmx22u8iGP4tTsQpZmyhUDwgbSeXE0NKDd72 wfTQ== 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=TsopxqOvOOzvvfo0UTxFDotQHgADb42ioezYj/InxjU=; b=Yqe/HAK3xivviDFwm61RA7MF5/3OqGf/1M8v/939VkWcRg1eNsDHoav3nISGm/QKUD Qp+G7q+ADUTZJ3G0xcVXgcfOeGEPVOq3DpXV4AZksaIw8G4y8GO60LnSZ5LXKsrtvkHa 1S0hSf1kyxfTrBAINBrWV8at9/14vaN7uwtTjDyWol+90+9y00liw7USZeTbvjqoSPmb FvbJScl5/1BabYC5+RxHDW3bC6U/nbwO20qVrTX8U15aumhKKMWZTLA74swXy0NxcRhZ O70zBJCo6uHSQHah1JbxDLQxPJ8Grv4x3jjwGgLM0fzNskNTmJzXJ1PaovShT+/rQR3X n8YQ== X-Gm-Message-State: AE9vXwMD+P0hYdCjn9rKDb8dGnO9eL1dmxdXRP+rilbJwMVJNTNW8niUUr26vegOB7wcYA== X-Received: by 10.36.65.155 with SMTP id b27mr981886itd.56.1474089231752; Fri, 16 Sep 2016 22:13:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:51 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 17/25] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Date: Sat, 17 Sep 2016 01:13:25 -0400 Message-Id: <1474089213-104014-18-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-17-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> <1474089213-104014-17-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 tells us our stateid has expired, then handle that as if it was revoked. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 84ee836a976c..75edf90455b4 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1919,7 +1919,6 @@ static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct case -NFS4ERR_STALE_CLIENTID: case -NFS4ERR_STALE_STATEID: set_bit(NFS_DELEGATED_STATE, &state->flags); - case -NFS4ERR_EXPIRED: /* Don't recall a delegation if it was lost */ nfs4_schedule_lease_recovery(server->nfs_client); return -EAGAIN; @@ -1931,6 +1930,7 @@ static int nfs4_handle_delegation_recall_error(struct nfs_server *server, struct return -EAGAIN; case -NFS4ERR_DELEG_REVOKED: case -NFS4ERR_ADMIN_REVOKED: + case -NFS4ERR_EXPIRED: case -NFS4ERR_BAD_STATEID: case -NFS4ERR_OPENMODE: nfs_inode_find_state_and_recover(state->inode,