From patchwork Sat Sep 17 05:13:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336989 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 279046077F for ; Sat, 17 Sep 2016 05:13:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AC1F29FAD for ; Sat, 17 Sep 2016 05:13:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FD4129FCB; Sat, 17 Sep 2016 05:13:58 +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 B4EC629FAD for ; Sat, 17 Sep 2016 05:13:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756771AbcIQFN4 (ORCPT ); Sat, 17 Sep 2016 01:13:56 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:33034 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756204AbcIQFNx (ORCPT ); Sat, 17 Sep 2016 01:13:53 -0400 Received: by mail-it0-f66.google.com with SMTP id x192so1859435itb.0 for ; Fri, 16 Sep 2016 22:13: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=PJJ9JBT9mqGGmPcSO9hg+Xg8gq1bBoDy/+YJ/MsnwJo=; b=EDKqPy5XfVW34VjGm44vJza/cl+sWw8lUsuvnZBOK5s+yOfQel062D8xAAHvceYTA3 qFrpO2fopuPuTK1mELQd+Lr5ZJpkQuYkuA7WZjYeLrocRvxYzzpA4D0jMuxHC5UHYCS5 4qJ4IF0qJdvL/H1woa8abyzdj/qg8vzsWymxx6tJOUQLBj4VD3ZN0ri/FMKhxEmTiAjJ G+tvRJ2ZbhAQgnH8pmAj8rtO0dK+Gh5XgL/9dIwEmXjPttxToggyfk0AdetlErsz3WQo MSCGwZLX8Y1OcbvwxiaJBYTY2W2jtqoLOyLUnZdcM1ufuBIgDtp/doBSHJ4kGD9ziIov f1cw== 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=PJJ9JBT9mqGGmPcSO9hg+Xg8gq1bBoDy/+YJ/MsnwJo=; b=KdUrnXrD6GyDKsRYeRXLP43sUEqoyPYCUBPHQtwyofbOLWO78Pq2anPQdw9LJSCMvJ KCvPMbDaoV9S8bPVCXhbnoJtaaz2ByZuEWK9nfehJ+0WEcTK/D3GP2rk192JNN3qBWGm f2jaqY7inQZPjQRgKbQjJH5Kz7IwvcoupTE2RODYdo9dCEO1p2ZzY66NjMqg0MWmxRUq /8n5HpW+D/Fun/p0LtGbfmfLD7TJV+k+pivckBOlgnji3noiLdd5Bk4op3g/Mxph7zUh 6Mk7eKHBDEq6FLvV6f6PEx5DA3jk9aWu4yX0pp2MwJhB78TrpA5/IWZ5iHuMOsE7qCIX fieQ== X-Gm-Message-State: AE9vXwMgPKNNuyVvSqT4gBIEQv2TN8k9COBABhRGe7xcz+6e90EZjfOzlVDvpuC5W4mrfg== X-Received: by 10.36.208.71 with SMTP id m68mr918530itg.104.1474089232824; Fri, 16 Sep 2016 22:13:52 -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.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:52 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 18/25] NFSv4: nfs4_handle_setlk_error() handle expiration as revoke case Date: Sat, 17 Sep 2016 01:13:26 -0400 Message-Id: <1474089213-104014-19-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-18-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> <1474089213-104014-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 75edf90455b4..0c050e932c7e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6086,6 +6086,7 @@ static void nfs4_handle_setlk_error(struct nfs_server *server, struct nfs4_lock_ { switch (error) { case -NFS4ERR_ADMIN_REVOKED: + case -NFS4ERR_EXPIRED: case -NFS4ERR_BAD_STATEID: lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED; if (new_lock_owner != 0 || @@ -6094,7 +6095,6 @@ static void nfs4_handle_setlk_error(struct nfs_server *server, struct nfs4_lock_ break; case -NFS4ERR_STALE_STATEID: lsp->ls_seqid.flags &= ~NFS_SEQID_CONFIRMED; - case -NFS4ERR_EXPIRED: nfs4_schedule_lease_recovery(server->nfs_client); }; }