diff --git a/[refs] b/[refs] index 75f39132379c..09ac088e69cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c6f6b79a64db7f1c7abf09d693db3b0066784fb +refs/heads/master: 0840d8af3e6e40bcd5f2366698eb2755f88acfea diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c index 68ee78109224..20b28dc0c97c 100644 --- a/trunk/fs/ceph/caps.c +++ b/trunk/fs/ceph/caps.c @@ -1444,7 +1444,6 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, 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;