From 448678a082f4f88a0a2e5afbe187a45078c9890e Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Sep 2010 08:38:25 -0700
Subject: [PATCH] --- yaml --- r: 211603 b: refs/heads/master c:
 93afd449aa3c0430ef409c13e1cb2b3f0458fc10 h: refs/heads/master i:   211601:
 c03d917515bac7c78d339a04bf8ed1f4aeff00bd   211599:
 c15200b310102a16641c2adc18ac40b104ec9ff9 v: v3

---
 [refs]               | 2 +-
 trunk/fs/ceph/caps.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d0f6b66bd09a..01201a1b1cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c32f5dda5ffe23687a55da1538b7cc426710d1a
+refs/heads/master: 93afd449aa3c0430ef409c13e1cb2b3f0458fc10
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 3cff67cbb9c0..3c03460f48bd 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/fs/ceph/caps.c
@@ -1534,7 +1534,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
 	 */
 	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 */