summaryrefslogtreecommitdiff
path: root/fs/ceph
diff options
context:
space:
mode:
authorJeff Layton <jlayton@kernel.org>2021-01-22 02:05:37 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 12:40:53 +0300
commit2783c34d54309ed88e2960b230fa75db301beefe (patch)
tree3a900bb3f142722c5eb1989b3eda24cb04b3f6e8 /fs/ceph
parentf8adfb1d370f035e1790a3d1a5e8a99ff0687bdd (diff)
downloadlinux-2783c34d54309ed88e2960b230fa75db301beefe.tar.xz
ceph: fix fscache invalidation
[ 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>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/caps.c1
-rw-r--r--fs/ceph/inode.c1
2 files changed, 2 insertions, 0 deletions
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);
}