From: Sage Weil <sage@newdream.net>
Date: Mon, 2 Mar 2009 21:45:40 +0000 (-0800)
Subject: Revert "kclient: fix __grab_cache_page #if"
X-Git-Tag: v0.7~81^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4dbed6ebcff3e84bd67efd9ade1488e3001665c;p=ceph.git

Revert "kclient: fix __grab_cache_page #if"

This reverts commit 220b116bfdc0ede84da93f296d42706fc0fc23f4.

Linux commit 54566b2c1594c2326a645a3551f9d989f7ba3c5e falls between
v2.6.28 and v2.6.29-rc1, so this #if should be 2.6.29.
---

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index 7148ef6afb8..8d6243a81ef 100644
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -840,7 +840,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,
 
 	/* get a page*/
 retry:
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
 	page = grab_cache_page_write_begin(mapping, index, 0);
 #else
 	page = __grab_cache_page(mapping, index);