From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1399C2BCC3 for ; Wed, 12 May 2021 19:57:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A93AE6142C for ; Wed, 12 May 2021 19:57:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384480AbhELT61 (ORCPT ); Wed, 12 May 2021 15:58:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:55756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353272AbhELSLH (ORCPT ); Wed, 12 May 2021 14:11:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 92B8A61943; Wed, 12 May 2021 18:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620842755; bh=q9p/jL1dxlKZfVTF1Fv6oBvpVsnuufUQ/yUS+MlceCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CKwMW955/S4btWqT8M5MOn6oMsFJ6b0cu/DLveiFr2l6MclioWZLUorwaL01QEcRF htPRXYXkASjUIa3o1DEfI7fLNWq/QtV5sSMYkznkYVp5Pk5dY2h3IHgTaQPLPA55yW dPXTjA2wnNYWiQiXoh4vHrohVqUlk7sQRLwW+u0RzcRul6zPf1IJhBXDAw5yIRU/gx uBJb/j1hjQY4ulWrl5zHvqm3pXCr5IDx4LPsofKKTYvnxN5gO1VUQgpgj53g/XHDih 41MdVggTDnvboILAF3NLdjIIfNJ0kEp/pcZUDN4CsEKarCXLxOTwiLerUqq5q7Bb9A gEaltjsab6Itg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeff Layton , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 5/7] ceph: fix fscache invalidation Date: Wed, 12 May 2021 14:05:42 -0400 Message-Id: <20210512180545.665946-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210512180545.665946-1-sashal@kernel.org> References: <20210512180545.665946-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeff Layton [ Upstream commit 10a7052c7868bc7bc72d947f5aac6f768928db87 ] Ensure that we invalidate the fscache whenever we invalidate the pagecache. Signed-off-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/caps.c | 1 + fs/ceph/inode.c | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 2a351821d8f3..0eb2ada032c7 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1577,6 +1577,7 @@ static int try_nonblocking_invalidate(struct inode *inode) u32 invalidating_gen = ci->i_rdcache_gen; spin_unlock(&ci->i_ceph_lock); + ceph_fscache_invalidate(inode); invalidate_mapping_pages(&inode->i_data, 0, -1); spin_lock(&ci->i_ceph_lock); diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 049cff197d2a..5e12ea92f7cd 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1762,6 +1762,7 @@ static void ceph_invalidate_work(struct work_struct *work) orig_gen = ci->i_rdcache_gen; spin_unlock(&ci->i_ceph_lock); + ceph_fscache_invalidate(inode); if (invalidate_inode_pages2(inode->i_mapping) < 0) { pr_err("invalidate_pages %p fails\n", inode); } -- 2.30.2