From: Jeff Layton <jlayton@kernel.org>
To: ceph-devel@vger.kernel.org, idryomov@gmail.com, dhowells@redhat.com
Cc: willy@infradead.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-cachefs@redhat.com
Subject: [PATCH 3/6] ceph: fix fscache invalidation
Date: Tue, 26 Jan 2021 08:41:00 -0500 [thread overview]
Message-ID: <20210126134103.240031-4-jlayton@kernel.org> (raw)
In-Reply-To: <20210126134103.240031-1-jlayton@kernel.org>
Ensure that we invalidate the fscache whenever we invalidate the
pagecache.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
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 ca07dfc60652..c40f713d6d21 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 adc8fc3c5d85..2caa6df0bcdf 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1906,6 +1906,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);
}
--
2.29.2
next prev parent reply other threads:[~2021-01-26 14:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 13:40 [PATCH 0/6] ceph: convert to new netfs read helpers Jeff Layton
2021-01-26 13:40 ` [PATCH 1/6] ceph: disable old fscache readpage handling Jeff Layton
2021-01-26 13:40 ` [PATCH 2/6] ceph: rework PageFsCache handling Jeff Layton
2021-01-26 13:41 ` Jeff Layton [this message]
2021-01-26 13:41 ` [PATCH 4/6] ceph: convert readpage to fscache read helper Jeff Layton
2021-01-26 13:41 ` [PATCH 5/6] ceph: plug write_begin into " Jeff Layton
2021-01-26 13:41 ` [PATCH 6/6] ceph: convert ceph_readpages to ceph_readahead Jeff Layton
2021-01-27 22:50 ` [PATCH 0/6] ceph: convert to new netfs read helpers Ilya Dryomov
2021-01-28 12:52 ` Jeff Layton
2021-01-28 20:48 ` Ilya Dryomov
2021-02-01 15:25 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210126134103.240031-4-jlayton@kernel.org \
--to=jlayton@kernel.org \
--cc=ceph-devel@vger.kernel.org \
--cc=dhowells@redhat.com \
--cc=idryomov@gmail.com \
--cc=linux-cachefs@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).