Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1316071yba; Tue, 2 Apr 2019 06:44:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgQnEnfzodsyiajT4bMC4J8RH8YYU2G73JFWzqOXPzu5yz21Ggj+tyVsYe1aLXBlA0dTi7 X-Received: by 2002:a65:6210:: with SMTP id d16mr17444308pgv.110.1554212699050; Tue, 02 Apr 2019 06:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554212699; cv=none; d=google.com; s=arc-20160816; b=HdiqRnmUubSihRHrzyNeq/jlpjc4BYXMTwDRQ5ESaZGkRB/nNWCUyROO+Nt7CgEgx/ GL8UWVenN+TvHVlI+Fl9FCJq6d0HBrgbjAO21Vwnbk7SsLVXK13fnF79aOPXD8EsOy9K czJmaE+fuL5uLi0in1ZQ2/cCIjoXaB54nqoaI25IY9fF86l9ATOF19wi5AadxUe21Ns6 fGHED64Vxv0o4GT7tYCcyY8WYd4+tVHO7lgFSuHRsY/GDQg+PvuYMnhMenES1w9b7VDp nyzYKzQyqSslLWgkepby3uVB5FF+9ZHWslkO3JqxB0eoZRUCazmQxqfhlmkXLoa9IgAo Hhcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=WWOI84r+SpO/9hKszI06WgVBOAYYebt4m8b87dPXbW0=; b=bJACR9lNlwTY8c6Bzx5Ki8+DrSs/9uuQecZYC80RgXuS+Wfb3s7KZkgWwoNuQLgD2O xINIIvGzDqxY/6gFTeIKkQ3NOhEUJF3gFV++LE8TJAvuN3VBE5w/xrCDY0++W0NlCP+2 JOWZ70CK5XCOlDuCMuXOqv5UYS/XuIxAu8LkdaLAosz28Bq/UO+CuZXJ7tur2+suAAQ3 C3q+S33YErH210bXFLrKUHx/NEoltNqJUTWWFSRA0pKasBszREUMrt/0RhCtRHG8ZmnP BBIGVWZCOgLetFflyIGTJZkfeHSUDbJ6Di67HXRWdIzIGajby1q+pvLYe2UbdlUvO4i5 q+BA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c14si3530561pls.106.2019.04.02.06.44.43; Tue, 02 Apr 2019 06:44:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731950AbfDBNni (ORCPT + 99 others); Tue, 2 Apr 2019 09:43:38 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:43606 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731512AbfDBNkL (ORCPT ); Tue, 2 Apr 2019 09:40:11 -0400 Received: from [167.98.27.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hBJe4-0002or-7z; Tue, 02 Apr 2019 14:40:08 +0100 Received: from ben by deadeye with local (Exim 4.92) (envelope-from ) id 1hBJdx-0004xE-QE; Tue, 02 Apr 2019 14:40:01 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, Denis Kirjanov , "Yan, Zheng" , "Ilya Dryomov" Date: Tue, 02 Apr 2019 14:38:28 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 84/99] ceph: don't update importing cap's mseq when handing cap export In-Reply-To: X-SA-Exim-Connect-IP: 167.98.27.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.65-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: "Yan, Zheng" commit 3c1392d4c49962a31874af14ae9ff289cb2b3851 upstream. Updating mseq makes client think importer mds has accepted all prior cap messages and importer mds knows what caps client wants. Actually some cap messages may have been dropped because of mseq mismatch. If mseq is left untouched, importing cap's mds_wanted later will get reset by cap import message. Signed-off-by: "Yan, Zheng" Signed-off-by: Ilya Dryomov Signed-off-by: Ben Hutchings --- fs/ceph/caps.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -2830,7 +2830,6 @@ retry: tcap->cap_id = t_cap_id; tcap->seq = t_seq - 1; tcap->issue_seq = t_seq - 1; - tcap->mseq = t_mseq; tcap->issued |= issued; tcap->implemented |= issued; if (cap == ci->i_auth_cap)