From patchwork Tue Sep 20 16:56:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9342141 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 2CDBA607D0 for ; Tue, 20 Sep 2016 16:56:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1EA5429495 for ; Tue, 20 Sep 2016 16:56:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 139B229979; Tue, 20 Sep 2016 16:56:45 +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 B6B8D29495 for ; Tue, 20 Sep 2016 16:56:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932340AbcITQ4n (ORCPT ); Tue, 20 Sep 2016 12:56:43 -0400 Received: from mail-qt0-f196.google.com ([209.85.216.196]:35032 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932368AbcITQ4m (ORCPT ); Tue, 20 Sep 2016 12:56:42 -0400 Received: by mail-qt0-f196.google.com with SMTP id 38so723220qte.2 for ; Tue, 20 Sep 2016 09:56:42 -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=noHP2I715/tWt3f//rL8GClipeHGc+Gzo95283gku2zDqwTuijrVIeBqqbyWi1UFWU 2y5pUlii2edAphD/EzliQet16nV2BgbXvAZ7yrSfS3hUBiKNw20bXsLw9l+KSO02GPRR xzyNceuwM/e89mi3LH0yLB8+wWm6ur9ZMeXS5Rh1MNL8zrgg6favYPDuRG71mQgpXJ+k GfsHdrr2xRP4oyypSK80RiSGNzQ30YvGYgHaWZIR+tIZowsrVIgosDTMj/Vj+xL8MMN9 3IMMrR71p4ezQAVN47aavpJmN4AtpxSOZgGkvuDM5mMdqL9c6MtQLUk5dDG7WJrRoOrh icQw== 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=GN2N44SOsl1MXDaiCiVWDu8h7tYy5jkc+5AjXj+c87Sfh2grrUgigLNkcZGuumyMTW QaLdzoTUgoTWfeV/7veFbBSd4mqH6hHg6oOWSolpNj2NveZnpNJuyPmgZ6oMipH/XJY+ cqFosggbn4ACqQNTYm++ScnZPhEuDTbQ4n3dO0dYmm+qw0jBPgHRInWIYQRWfPhOsLQ8 d8siy7CrXC2AUFacEI/wP/d/NiWGhhvVu63Gg/StlbWeWDXr2wbxXrlGA+YOHe8SgtTk 5SJxVVBhHxQbeY9Rl+OdRB+J0SQv+okaK6xqCuvYVJbDt6BLCJuYtZZSlau59CCrQRa9 pn2w== X-Gm-Message-State: AE9vXwPQVxa93PvVy9bwDXIIeDqTrtqsdGfP3X9d+/k4J1mAXcpRNKkJ18fqlvRwwInjCw== X-Received: by 10.200.45.220 with SMTP id q28mr36789148qta.108.1474390602105; Tue, 20 Sep 2016 09:56:42 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 09:56:41 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v6 19/29] NFSv4: nfs4_handle_setlk_error() handle expiration as revoke case Date: Tue, 20 Sep 2016 12:56:01 -0400 Message-Id: <1474390571-17106-20-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474390571-17106-19-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> <1474390571-17106-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); }; }