All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: dhowells@redhat.com, idryomov@gmail.com
Cc: xiubli@redhat.com, ceph-devel@vger.kernel.org,
	linux-cachefs@redhat.com, linux-fsdevel@vger.kernel.org
Subject: [PATCH v2 3/6] ceph: fix fscache invalidation
Date: Wed, 17 Feb 2021 07:58:42 -0500	[thread overview]
Message-ID: <20210217125845.10319-4-jlayton@kernel.org> (raw)
In-Reply-To: <20210217125845.10319-1-jlayton@kernel.org>

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

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Cc: ceph-devel@vger.kernel.org
Cc: linux-cachefs@redhat.com
Cc: linux-fsdevel@vger.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


  parent reply	other threads:[~2021-02-17 12:59 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20210217125845.10319-1-jlayton@kernel.org>
2021-02-17 12:58 ` [PATCH v2 1/6] ceph: disable old fscache readpage handling Jeff Layton
2021-02-19  5:09   ` Xiubo Li
2021-02-22 14:47     ` Jeff Layton
2021-02-17 12:58 ` [PATCH v2 2/6] ceph: rework PageFsCache handling Jeff Layton
2021-02-17 14:38   ` Matthew Wilcox
2021-02-17 14:59     ` Jeff Layton
2021-02-17 12:58 ` Jeff Layton [this message]
2021-02-17 12:58 ` [PATCH v2 4/6] ceph: convert readpage to fscache read helper Jeff Layton
2021-02-17 15:47   ` kernel test robot
2021-02-17 15:50     ` Jeff Layton
2021-02-17 12:58 ` [PATCH v2 5/6] ceph: plug write_begin into " Jeff Layton
2021-02-17 12:58 ` [PATCH v2 6/6] ceph: convert ceph_readpages to ceph_readahead Jeff Layton
2021-02-17 15:15   ` Matthew Wilcox
2021-02-17 15:46     ` Jeff Layton

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=20210217125845.10319-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=xiubli@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.