From patchwork Thu Sep 22 17:39:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9346019 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 82B5F60B16 for ; Thu, 22 Sep 2016 17:40:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D3562AC06 for ; Thu, 22 Sep 2016 17:40:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71EDC2AC0C; Thu, 22 Sep 2016 17:40:09 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 CE79B2AC06 for ; Thu, 22 Sep 2016 17:40:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965693AbcIVRkC (ORCPT ); Thu, 22 Sep 2016 13:40:02 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:33502 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965901AbcIVRjz (ORCPT ); Thu, 22 Sep 2016 13:39:55 -0400 Received: by mail-it0-f67.google.com with SMTP id x192so5346930itb.0 for ; Thu, 22 Sep 2016 10:39:54 -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=wTd9zmimC90INys0n8bsrh4iT8Kiq4tnenQJFXoD++E=; b=txmI2/ppoH/I7nmZsPBRtEkPn7ThEewOm0zEnYhpKSTJdyg/R+gkP2OgcaBN5sVP0a mGMgt9Ez+CmLZNroC6eJoGvnhGRTQ/Rr+ntiCOfbwA7LkSeDKFc3RiW4+N7gAb6ngZxQ bbGupoLSA4REOUV880raOkEYi9c3axl6fwV5IbAav+EPVbYHcORX+3cdl3JV1GdeBV0i J9JCKujZOGbG/9T8j3EryWHxIyalZV/2BLPjJttYZkswfWTJZ1giEs7N2kQWvraJZW9K 9YeLGZocdu+uW5OLZW9oazSu0U4b/RMoxqk2pV1zu0XwdS9U4/DegIhJnQONEwJdF+Bd /+fA== 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=wTd9zmimC90INys0n8bsrh4iT8Kiq4tnenQJFXoD++E=; b=Z87xUuhHpn7EUeCcqgkNoFiReq9wwuQ9cHcBSXivskRmiLviOkYsj1nTN280yne44g ol/g56WNrK7nAgGiEQCWto+OiF2OEMFDJ4aTveYqVYqDX1dcJOw3EkhOLMegsFl0q7HQ HMyDknofcg7cCglvM0xq7sAKIBTlfc+wC2d5JvwihdejN5FmYLm2a5mK725uTVFRI6Dn 9hZyyXMKekLeHnBuAtMwrq+gRMdtRFx1m2zEGuHJEyZN0W6MlLY/KerYF/mj5cpAJiIy 1e2yr+EEu3zA21Qkd4n/lAJ73kUXWo1VdPoPELlaOhfguDI2/rU3l3t3wVZxD+OcFmef +mLg== X-Gm-Message-State: AE9vXwMMYjBrTbZ9KyO0WE10wbL2OdTl9cHpkgM3OiUZsV5FT1sw1n4W4xMYbpsPECWvAA== X-Received: by 10.36.65.22 with SMTP id x22mr1886089ita.82.1474565994213; Thu, 22 Sep 2016 10:39:54 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 10:39:53 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v7 19/31] NFSv4: nfs4_handle_setlk_error() handle expiration as revoke case Date: Thu, 22 Sep 2016 13:39:09 -0400 Message-Id: <1474565961-21303-20-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474565961-21303-19-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> <1474565961-21303-19-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 75dc389c9719..f0c5442401d7 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); }; }