summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-09-17 08:38:25 -0700
committerSage Weil <sage@newdream.net>2010-10-20 15:38:15 -0700
commit93afd449aa3c0430ef409c13e1cb2b3f0458fc10 (patch)
treedd9ab308735c2414260539e33605197a5f90f069
parent4c32f5dda5ffe23687a55da1538b7cc426710d1a (diff)
downloadlinux-3.10-93afd449aa3c0430ef409c13e1cb2b3f0458fc10.tar.gz
linux-3.10-93afd449aa3c0430ef409c13e1cb2b3f0458fc10.tar.bz2
linux-3.10-93afd449aa3c0430ef409c13e1cb2b3f0458fc10.zip
ceph: only invalidate on check_caps if we actually have pages
The i_rdcache_gen value only implies we MAY have cached pages; actually check the mapping to see if it's worth bothering with an invalidate. Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--fs/ceph/caps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 3cff67cbb9c..3c03460f48b 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1534,7 +1534,7 @@ retry_locked:
*/
if ((!is_delayed || mdsc->stopping) &&
ci->i_wrbuffer_ref == 0 && /* no dirty pages... */
- ci->i_rdcache_gen && /* may have cached pages */
+ inode->i_data.nrpages && /* have cached pages */
(file_wanted == 0 || /* no open files */
(revoking & (CEPH_CAP_FILE_CACHE|
CEPH_CAP_FILE_LAZYIO))) && /* or revoking cache */