From patchwork Thu Jan 26 20:14:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9540043 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 C1D89601D3 for ; Thu, 26 Jan 2017 20:14:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B55B128335 for ; Thu, 26 Jan 2017 20:14:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A861C28343; Thu, 26 Jan 2017 20:14:56 +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 3535728335 for ; Thu, 26 Jan 2017 20:14:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753324AbdAZUOz (ORCPT ); Thu, 26 Jan 2017 15:14:55 -0500 Received: from mail-io0-f176.google.com ([209.85.223.176]:32867 "EHLO mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753439AbdAZUOy (ORCPT ); Thu, 26 Jan 2017 15:14:54 -0500 Received: by mail-io0-f176.google.com with SMTP id v96so45804738ioi.0 for ; Thu, 26 Jan 2017 12:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=0zzKzVcqhUvAIJ7AmmSwA7MHr2OAxiwG0HCm03WObTU=; b=pMWdDOYu6DGDBVP1XX3YI8aiWKN1fpYH32VzZR863JM+PN9HP2xfG9GKVbm0m9pRfc n+HhXLsqCJKkbifHPglgcT9tyWVwd8tUKHGjqf9mzlSyD7DpX4TlpX4bLcb1/AWGjx9L 8l6kZH4k4Nfl0SUYZKZdTkjKfvEQgBst0b6imC1zg4+8ZgxC/qRrD03YbESmNburEIQr vd9/EC6UwZI4Wgl4FVK/ugZhk5kKDk+Iq1psUWBOTiui3SNNGFS6rsQiBBnLEhkRRISF zXrQ1OCM2jV+I3xSSz6gCpzugkaGnA1K5Jb0RKBp11Mb8alf0ueY8lOwCssCgwZs6E7M ItMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :user-agent:mime-version:content-transfer-encoding; bh=0zzKzVcqhUvAIJ7AmmSwA7MHr2OAxiwG0HCm03WObTU=; b=JaPwFj2XLvVh3GPLl9B7gCkBlz3Ea7ylUU5/+Ad926jWHg9Mkk14Z6LhXLxXSkmyTt z5tCe9BZLbTorqDKU64B9vGV68zae8ixKWdYYVSNfd7mwlvkp2Kq1Z3V43/OWko8AiMv yUZaOU2CVhu8DJ+jSP0uTpdgvGKOcNvPTGL6OxFJUeEil+YUEwIXyh4kivw72SnqK1Sc qiFboXX2mUCSz5pX6m5TK1e55bvwu9emv+y5duTnx4pB8Zoyb3SoZ6V4jx76lSy74ayM e5szaSWzORH2iP/kXkJ3aSfPK443LNT8BP79kjzoLKD1/5hO22nTltqTFgeVksHsIbW3 Mngw== X-Gm-Message-State: AIkVDXJ76l4PGHeTvXM8ywFSGZeswTLBxw8KAkUpeNA1q0/qWiN/kxvryawYGHz54V/iMA== X-Received: by 10.107.128.89 with SMTP id b86mr4542696iod.93.1485461693557; Thu, 26 Jan 2017 12:14:53 -0800 (PST) Received: from manet.1015granger.net ([2604:8800:100:81fc:ec4:7aff:fe6c:1dce]) by smtp.gmail.com with ESMTPSA id 96sm1943543ioh.27.2017.01.26.12.14.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 12:14:53 -0800 (PST) Subject: [PATCH] nfs: Fix "Don't increment lock sequence ID after NFS4ERR_MOVED" From: Chuck Lever To: linux-nfs@vger.kernel.org, trond.myklebust@primarydata.com, anna.schumaker@netapp.com Date: Thu, 26 Jan 2017 15:14:52 -0500 Message-ID: <20170126201452.6760.70964.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 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 Lock sequence IDs are bumped in decode_lock by calling nfs_increment_seqid(). nfs_increment_sequid() does not use the seqid_mutating_err() function fixed in commit 059aa7348241 ("Don't increment lock sequence ID after NFS4ERR_MOVED"). Fixes: 059aa7348241 ("Don't increment lock sequence ID after ...") Signed-off-by: Chuck Lever Tested-by: Xuan Qi Cc: stable@vger.kernel.org # v3.7+ --- fs/nfs/nfs4state.c | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 90e6193..daeb94e 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1091,6 +1091,7 @@ static void nfs_increment_seqid(int status, struct nfs_seqid *seqid) case -NFS4ERR_BADXDR: case -NFS4ERR_RESOURCE: case -NFS4ERR_NOFILEHANDLE: + case -NFS4ERR_MOVED: /* Non-seqid mutating errors */ return; };