From 8af94b6196717637b67d87680bf4c45724f9e1d8 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Sep 2010 10:46:44 -0700
Subject: [PATCH] --- yaml --- r: 211604 b: refs/heads/master c:
 18a38193efcaac1fb3c94ad8fa04bb117850a3c2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 01201a1b1cb4..4ee42a9aef7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93afd449aa3c0430ef409c13e1cb2b3f0458fc10
+refs/heads/master: 18a38193efcaac1fb3c94ad8fa04bb117850a3c2
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 3c03460f48bd..98ab13e2b71d 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/fs/ceph/caps.c
@@ -1417,17 +1417,6 @@ static int __mark_caps_flushing(struct inode *inode,
 /*
  * try to invalidate mapping pages without blocking.
  */
-static int mapping_is_empty(struct address_space *mapping)
-{
-	struct page *page = find_get_page(mapping, 0);
-
-	if (!page)
-		return 1;
-
-	put_page(page);
-	return 0;
-}
-
 static int try_nonblocking_invalidate(struct inode *inode)
 {
 	struct ceph_inode_info *ci = ceph_inode(inode);
@@ -1437,7 +1426,7 @@ static int try_nonblocking_invalidate(struct inode *inode)
 	invalidate_mapping_pages(&inode->i_data, 0, -1);
 	spin_lock(&inode->i_lock);
 
-	if (mapping_is_empty(&inode->i_data) &&
+	if (inode->i_data.nrpages == 0 &&
 	    invalidating_gen == ci->i_rdcache_gen) {
 		/* success. */
 		dout("try_nonblocking_invalidate %p success\n", inode);