From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Feb 2010 23:44:16 +0000 (-0800)
Subject: ceph: invalidate pages even if truncate is pending
X-Git-Tag: v2.6.34-rc2~9^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0840d8af3e6e40bcd5f2366698eb2755f88acfea;p=thirdparty%2Fkernel%2Flinux.git

ceph: invalidate pages even if truncate is pending

There is no reason not to invalidate pages when a truncate is pending.
Both throw out page cache pages.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 68ee78109224b..20b28dc0c97c7 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1444,7 +1444,6 @@ retry_locked:
 	    ci->i_rdcache_gen &&                     /* may have cached pages */
 	    (file_wanted == 0 ||                     /* no open files */
 	     (revoking & CEPH_CAP_FILE_CACHE)) &&     /*  or revoking cache */
-	    !ci->i_truncate_pending &&
 	    !tried_invalidate) {
 		u32 invalidating_gen = ci->i_rdcache_gen;
 		int ret;