From 6909ccabd4114f22ec0f3c6cdc4da1f3eee348f6 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 26 May 2021 13:39:40 +0000 Subject: [PATCH] ceph: fix fscache invalidation stable inclusion from stable-5.10.39 commit 2783c34d54309ed88e2960b230fa75db301beefe bugzilla: 51881 CVE: NA -------------------------------- [ 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 Signed-off-by: Chen Jun Acked-by: Weilong Chen Signed-off-by: Zheng Zengkai --- 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 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); } -- GitLab