From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Sep 2010 15:38:25 +0000 (-0700)
Subject: ceph: only invalidate on check_caps if we actually have pages
X-Git-Tag: v2.6.37-rc3~2^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93afd449aa3c0430ef409c13e1cb2b3f0458fc10;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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>
---

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 3cff67c..3c03460 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 */