From patchwork Tue Sep 20 16:56:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342139 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 025D1607D0 for ; Tue, 20 Sep 2016 16:56:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E85E129495 for ; Tue, 20 Sep 2016 16:56:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DCF6429979; Tue, 20 Sep 2016 16:56:43 +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 95DB529495 for ; Tue, 20 Sep 2016 16:56:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932174AbcITQ4m (ORCPT ); Tue, 20 Sep 2016 12:56:42 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36075 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932340AbcITQ4l (ORCPT ); Tue, 20 Sep 2016 12:56:41 -0400 Received: by mail-qk0-f195.google.com with SMTP id z143so1432557qka.3 for ; Tue, 20 Sep 2016 09:56:41 -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=fyknSZxb2aTV3jfkpRoZhfRDUDwoGVWmcW89w8z5CwQGvv0g0R/13YE0zUDlzWyW1H 2bK4YmfuavB6LZRhOO0qQnSvt4WS0eRxzuY8KqcaFS0/jjsCRT/H43dpULIodaDCOaqS oW5eR+pfu6QVFN5svqbbWedKu1YUwSGP5gD4NkvmyQd0pugHaVNHc7ZYHt6ZEcxhEaZy GqyLmlrmiw4XilYGKFk1JZxBfzmA7wPqyZWgPhdbrg8pnl+CfJxENqWld9pQiyJtZYzw 5LdboXMWoj57jnTmMEn9LKlO7IxwDt2e2pHMmD2z38Xzyra0RSp+Qk20dZPS0U/NANJI QgyQ== 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=e0cOHqHubP31+k0P6sK7lnng1YqyjMSgNvNGdOy+iThmowqtfNA4l+U8mia6Mwi4tt +Gb7AnvBFIDMJcptSNbiL4rPPrl5mNab1dN0IGvOImvlK/MbRXB2zHLWBWih/ewYHZwZ Cn28VId3625jemANTDy7/h6VWCzT6QZOZOrpUdhyjLHhf/9JIv6mWtbvU7jMbbRnvsKg 7DbmsCOLBpe6m9lgUMFZZjmDFFfw2Lf0XfA46S3yLpZXW4iVHiF9N/5w94n2nFr/Mc4r owHpPSxE/AIPAgZAnqW2An2isRkihmB8jZsveYruaKCUpt3o1fX6VnbcYFq44Le9srpG 0rFg== X-Gm-Message-State: AE9vXwN3MtYbfxYwTVxOiAi3A/njEQWZy8pAPDQlAcqk+8ll00o6x8iA7SIkSiV0rM6wdQ== X-Received: by 10.55.175.134 with SMTP id y128mr35508233qke.134.1474390600877; Tue, 20 Sep 2016 09:56:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 09:56:40 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v6 18/29] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Date: Tue, 20 Sep 2016 12:56:00 -0400 Message-Id: <1474390571-17106-19-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474390571-17106-18-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> <1474390571-17106-7-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-8-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-9-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-10-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-11-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-12-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-13-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-14-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-15-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-16-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-17-git-send-email-trond.myklebust@primarydata.com> <1474390571-17106-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,