diff mbox series

[5.12,27/45] ceph: fix fscache invalidation

Message ID	20210520092054.409094488@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jeff Layton <jlayton@kernel.org>, Ilya Dryomov <idryomov@gmail.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.12 27/45] ceph: fix fscache invalidation Date: Thu, 20 May 2021 11:22:15 +0200 Message-Id: <20210520092054.409094488@linuxfoundation.org> In-Reply-To: <20210520092053.516042993@linuxfoundation.org> References: <20210520092053.516042993@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.12,02/45] drm/i915/display: fix compiler warning about array overrun [5.12,03/45] airo: work around stack usage warning [5.12,04/45] kgdb: fix gcc-11 warning on indentation [5.12,05/45] usb: sl811-hcd: improve misleading indentation [5.12,06/45] ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 [5.12,07/45] PCI: thunder: Fix compile testing [5.12,08/45] dmaengine: dw-edma: Fix crash on loading/unloading driver [5.12,09/45] ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend() [5.12,10/45] NFS: Fix fscache invalidation in nfs_set_cache_invalid() [5.12,11/45] ACPI / hotplug / PCI: Fix reference count leak in enable_slot() [5.12,12/45] PCI: tegra: Fix runtime PM imbalance in pex_ep_event_pex_rst_deassert() [5.12,13/45] Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices [5.12,14/45] Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state [5.12,15/45] NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid [5.12,16/45] f2fs: fix to avoid NULL pointer dereference [5.12,17/45] svcrdma: Dont leak send_ctxt on Send errors [5.12,18/45] um: Mark all kernel symbols as local [5.12,19/45] um: Disable CONFIG_GCOV with MODULES [5.12,20/45] PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata [5.12,21/45] ARM: 9075/1: kernel: Fix interrupted SMC calls [5.12,22/45] platform/chrome: cros_ec_typec: Add DP mode check [5.12,23/45] riscv: Use $(LD) instead of $(CC) to link vDSO [5.12,24/45] scripts/recordmcount.pl: Fix RISC-V regex for clang [5.12,25/45] riscv: Workaround mcount name prior to clang-13 [5.12,26/45] scsi: lpfc: Fix illegal memory access on Abort IOCBs [5.12,27/45] ceph: fix fscache invalidation [5.12,28/45] ceph: dont clobber i_snap_caps on non-I_NEW inode [5.12,29/45] ceph: dont allow access to MDS-private inodes [5.12,30/45] scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found [5.12,31/45] amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID [5.12,32/45] bridge: Fix possible races between assigning rx_handler_data and setting IFF_BRIDGE_... [5.12,33/45] net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info [5.12,34/45] nvmet: remove unsupported command noise [5.12,35/45] drm/amd/display: Fix two cursor duplication when using overlay [5.12,36/45] gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055 [5.12,37/45] net:CXGB4: fix leak if sk_buff is not used [5.12,38/45] ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP [5.12,39/45] block: reexpand iov_iter after read/write [5.12,40/45] lib: stackdepot: turn depot_lock spinlock to raw_spinlock [5.12,41/45] net: stmmac: Do not enable RX FIFO overflow interrupts [5.12,42/45] ip6_gre: proper dev_{hold\|put} in ndo_[un]init methods [5.12,43/45] sit: proper dev_{hold\|put} in ndo_[un]init methods [5.12,44/45] ip6_tunnel: sit: proper dev_{hold\|put} in ndo_[un]init methods [5.12,45/45] ipv6: remove extra dev_hold() for fallback tunnels

Commit Message

Greg KH May 20, 2021, 9:22 a.m. UTC

From: Jeff Layton <jlayton@kernel.org>

[ Upstream commit 10a7052c7868bc7bc72d947f5aac6f768928db87 ]

Ensure that we invalidate the fscache whenever we invalidate the
pagecache.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/ceph/caps.c  | 1 +
 fs/ceph/inode.c | 1 +
 2 files changed, 2 insertions(+)

diff mbox series

Patch

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 570731c4d019..d405ba801492 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1867,6 +1867,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 156f849f5385..4418d4be2907 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1863,6 +1863,7 @@  static void ceph_do_invalidate_pages(struct inode *inode)
 	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);
 	}