From patchwork Thu Sep 22 17:39:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9346049 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 474F4607D0 for ; Thu, 22 Sep 2016 17:40:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40E5428580 for ; Thu, 22 Sep 2016 17:40:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 357542ABF2; Thu, 22 Sep 2016 17:40: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 D666628580 for ; Thu, 22 Sep 2016 17:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965367AbcIVRkX (ORCPT ); Thu, 22 Sep 2016 13:40:23 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:33127 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965884AbcIVRjx (ORCPT ); Thu, 22 Sep 2016 13:39:53 -0400 Received: by mail-io0-f193.google.com with SMTP id r145so5603814ior.0 for ; Thu, 22 Sep 2016 10:39:53 -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=OAJbEJvkmbmt2F7/K38zq6fKYcvz/lWP37fhvdLO8LU=; b=tSfjAKzMuezdAxnRqY4p84UtTiyRy9egCBcBueOkf53aCgKrc3n+B8lv235Gsni9nW TxEODxKS5ji3Q8OiX51pcW3YC2nLIKgiTNEUZmm3/rt6vjnT6EBUeYyVIUpAR7dZxyQR lRtmetVdLP4RPX6OM/ehmddMslnhTQfvrrjDYGzwiocjDZCfn9Jg/1GDdlezH/p3VnbE SnGz1lKCWDg/QQ5zV/PFj/Q+vsHy+YnYugRIAzzGB2U2R1qRsTZheB6PPrl3fWZnyDYs froTNWTnhNnQMth22PCqkFqjAK1yS7jpjmy4RcuUk1XlkgdxgxAgy/Oa8KAxouMFSlWn W92Q== 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=OAJbEJvkmbmt2F7/K38zq6fKYcvz/lWP37fhvdLO8LU=; b=T3ZNkpWjqOFX8odtvbbLQ0yjH/9zTqbYKUZu2iLFDR5QYDjCZYfsA/KMpUx/ria1di NHRpUXajwm/G7hL8oxri8hk61kvRn5ZoFetakeBMu2186M5Tsj6CJvShbaxRSGqwkrfZ m2JGywb0OqaICWYoYsCSoEajfonmQsXIaAX8aCIdljvf8CkuEtlaAaUbycNiHDI1FwNB zLfk0zp/o1e0czlw030Vk3nGRiIiyEu2SIAKTuIYuLbKheVO/Uqw2XGZzzv/HDhbtKqF KjZq5ex+jap4wBtNoe1p65at9N8s23L8TrE+MiwbtYi/EzqAoZYcatTW8ppdcpS8kBkM 2DVQ== X-Gm-Message-State: AA6/9RkY5PVpcOtWvr52a4W8sUoAOVRweB0zFkdJE9NENa8nbrDeVw/50v6xzHkTy+i2bg== X-Received: by 10.107.159.138 with SMTP id i132mr4563664ioe.177.1474565993069; Thu, 22 Sep 2016 10:39:53 -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.39.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:39:52 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 18/31] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Date: Thu, 22 Sep 2016 13:39:08 -0400 Message-Id: <1474565961-21303-19-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-18-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> 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 f79d4f55d83f..75dc389c9719 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,