From: Sage Weil <sage@newdream.net>
Date: Fri, 17 Sep 2010 17:46:44 +0000 (-0700)
Subject: ceph: use mapping->nrpages to determine if mapping is empty
X-Git-Tag: v2.6.37-rc3~2^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18a38193efcaac1fb3c94ad8fa04bb117850a3c2;p=platform%2Fkernel%2Flinux-3.10.git

ceph: use mapping->nrpages to determine if mapping is empty

This is simpler and faster.

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

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 3c03460..98ab13e 100644
--- a/fs/ceph/caps.c
+++ b/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);