Skip to contentSkip to conversation

ceph: no need to invalidate the fscache twice

RFC PATCH In review [email protected] 2 participants 2 messages Apr 7, 2022 Ceph client

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ceph: no need to invalidate the fscache twice

From: Xiubo Li <[email protected]>

[ Introduced by commit 400e1286c0ec3: "ceph: conversion to new fscache API" ]

---

Jeff, is there any reason we need to invalidate the fscache twice in ceph_do_invalidate_pages() ?

 fs/ceph/inode.c | 1 -
 1 file changed, 1 deletion(-)
fs/ceph/inode.c +0 -1
index cc1829ab497d..b721d86fb582 100644
@@ -2084,7 +2084,6 @@ 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, false);
 	if (invalidate_inode_pages2(inode->i_mapping) < 0) {
 		pr_err("invalidate_inode_pages2 %llx.%llx failed\n",
 		       ceph_vinop(inode));
Signature · 1 line
2.27.0
#1 lore raw
Quoted 10 lines · On Thu, 2022-04-07 at 13:12 +0800, [email protected] wrote:

From: Xiubo Li <[email protected]>

[ Introduced by commit 400e1286c0ec3: "ceph: conversion to new fscache API" ]

---

Jeff, is there any reason we need to invalidate the fscache twice in ceph_do_invalidate_pages() ?

No, that was a mistake. I'll go ahead and fold this patch into 400e1286c0ec3.

Quoted 9 lines
 fs/ceph/inode.c | 1 -
 1 file changed, 1 deletion(-)
fs/ceph/inode.c +0 -0
index cc1829ab497d..b721d86fb582 100644

fs/ceph/inode.c static void ceph_do_invalidate_pages(struct inode *inode) · line 2089

Quoted 7 lines
fs/ceph/inode.c +0 -1
@@ -2084,7 +2084,6 @@ 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, false);
 	if (invalidate_inode_pages2(inode->i_mapping) < 0) {
 		pr_err("invalidate_inode_pages2 %llx.%llx failed\n",
 		       ceph_vinop(inode));

Thanks!

Signature · 1 line
Jeff Layton <[email protected]>