From: Sage Weil <sage@newdream.net>
Date: Wed, 25 Feb 2009 22:40:55 +0000 (-0800)
Subject: kclient: changes for 2.6.29
X-Git-Tag: v0.7~143
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95675f50c28633b3770665c632d028809999875e;p=ceph.git

kclient: changes for 2.6.29
---

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index be7032a9a59..d2d0641aab5 100644
--- a/src/kernel/addr.c
+++ b/src/kernel/addr.c
@@ -840,7 +840,11 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,
 
 	/* get a page*/
 retry:
+#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);
+#endif
 	if (!page)
 		return -ENOMEM;
 	*pagep = page;
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 946da1431c0..1b436ca6406 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -1005,8 +1005,13 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
 	head->num_fwd = 0;
 	head->mds_wants_replica_in_dirino = 0;
 	head->op = cpu_to_le32(req->r_op);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+	head->caller_uid = cpu_to_le32(current_fsuid());
+	head->caller_gid = cpu_to_le32(current_fsgid());
+#else
 	head->caller_uid = cpu_to_le32(current->fsuid);
 	head->caller_gid = cpu_to_le32(current->fsgid);
+#endif
 	head->args = req->r_args;
 
 	if (req->r_op == CEPH_MDS_OP_FINDINODE) {