diff mbox series

[5.10,27/47] ceph: fix fscache invalidation

Message ID	20210520092054.426572911@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.10 27/47] ceph: fix fscache invalidation Date: Thu, 20 May 2021 11:22:25 +0200 Message-Id: <20210520092054.426572911@linuxfoundation.org> In-Reply-To: <20210520092053.559923764@linuxfoundation.org> References: <20210520092053.559923764@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.10,02/47] drm/i915/display: fix compiler warning about array overrun [5.10,03/47] airo: work around stack usage warning [5.10,04/47] kgdb: fix gcc-11 warning on indentation [5.10,05/47] usb: sl811-hcd: improve misleading indentation [5.10,06/47] cxgb4: Fix the -Wmisleading-indentation warning [5.10,07/47] isdn: capi: fix mismatched prototypes [5.10,08/47] virtio_net: Do not pull payload in skb->head [5.10,09/47] ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 [5.10,10/47] PCI: thunder: Fix compile testing [5.10,11/47] dmaengine: dw-edma: Fix crash on loading/unloading driver [5.10,12/47] ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend() [5.10,13/47] ACPI / hotplug / PCI: Fix reference count leak in enable_slot() [5.10,14/47] PCI: tegra: Fix runtime PM imbalance in pex_ep_event_pex_rst_deassert() [5.10,15/47] Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices [5.10,16/47] Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state [5.10,17/47] NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid [5.10,18/47] um: Mark all kernel symbols as local [5.10,19/47] um: Disable CONFIG_GCOV with MODULES [5.10,20/47] PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata [5.10,21/47] ARM: 9075/1: kernel: Fix interrupted SMC calls [5.10,22/47] platform/chrome: cros_ec_typec: Add DP mode check [5.10,23/47] riscv: Use $(LD) instead of $(CC) to link vDSO [5.10,24/47] scripts/recordmcount.pl: Fix RISC-V regex for clang [5.10,25/47] riscv: Workaround mcount name prior to clang-13 [5.10,26/47] scsi: lpfc: Fix illegal memory access on Abort IOCBs [5.10,27/47] ceph: fix fscache invalidation [5.10,28/47] ceph: dont clobber i_snap_caps on non-I_NEW inode [5.10,29/47] ceph: dont allow access to MDS-private inodes [5.10,30/47] scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found [5.10,31/47] amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID [5.10,32/47] bridge: Fix possible races between assigning rx_handler_data and setting IFF_BRIDGE_... [5.10,33/47] net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info [5.10,34/47] nvmet: remove unsupported command noise [5.10,35/47] drm/amd/display: Fix two cursor duplication when using overlay [5.10,36/47] gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055 [5.10,37/47] net:CXGB4: fix leak if sk_buff is not used [5.10,38/47] ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP [5.10,39/47] block: reexpand iov_iter after read/write [5.10,40/47] lib: stackdepot: turn depot_lock spinlock to raw_spinlock [5.10,41/47] net: stmmac: Do not enable RX FIFO overflow interrupts [5.10,42/47] ip6_gre: proper dev_{hold\|put} in ndo_[un]init methods [5.10,43/47] sit: proper dev_{hold\|put} in ndo_[un]init methods [5.10,44/47] ip6_tunnel: sit: proper dev_{hold\|put} in ndo_[un]init methods [5.10,45/47] ipv6: remove extra dev_hold() for fallback tunnels [5.10,46/47] tweewide: Fix most Shebang lines [5.10,47/47] scripts: switch explicitly to Python 3

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 576d01275bbd..e4fc99afa25a 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1866,6 +1866,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 2462a9a84b95..6bd2a6ced22a 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1912,6 +1912,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);
 	}