From c6fece04eeebc7d0166a2bef640634dd59eb7ed3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 12 Nov 2009 15:07:24 -0800 Subject: [PATCH] --- yaml --- r: 188619 b: refs/heads/master c: 11ea8eda064aa4dc6e44a6dade1891b69ebd5255 h: refs/heads/master i: 188617: 5fea93d851939a80dfebbaddd8012b56f055cf59 188615: 112d3b10408f3903168e4e20e4eff3bcbdd4b02f v: v3 --- [refs] | 2 +- trunk/fs/ceph/caps.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7082699befe0..594c301972ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 039934b895c89c2bb40aa5132efe00e60b70efca +refs/heads/master: 11ea8eda064aa4dc6e44a6dade1891b69ebd5255 diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c index d8132b6e770d..9dd110602cda 100644 --- a/trunk/fs/ceph/caps.c +++ b/trunk/fs/ceph/caps.c @@ -1440,7 +1440,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags, dout("check_caps trying to invalidate on %p\n", inode); spin_unlock(&inode->i_lock); - ret = invalidate_inode_pages2(&inode->i_data); + ret = invalidate_mapping_pages(&inode->i_data, 0, -1); spin_lock(&inode->i_lock); if (ret == 0 && invalidating_gen == ci->i_rdcache_gen) { /* success. */ @@ -2180,7 +2180,7 @@ static int handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, spin_unlock(&inode->i_lock); tried_invalidate = 1; - ret = invalidate_inode_pages2(&inode->i_data); + ret = invalidate_mapping_pages(&inode->i_data, 0, -1); spin_lock(&inode->i_lock); if (ret < 0) { /* there were locked pages.. invalidate later