kclient: changes for 2.6.29

diff --git a/src/kernel/addr.c b/src/kernel/addr.c
index be7032a9a5949fde2f5fd5ec4cf0543b8f99b1a8..d2d0641aab50682bf09dcb2ca3fd11322682794f 100644 (file)
--- 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 946da1431c02f36af33199c8cd3a8257dc00df00..1b436ca640647918da6f72e28fa6535112b2008d 100644 (file)
--- 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) {