kclient: fix up kobj for 2.6.24

diff --git a/src/kernel/ktcp.c b/src/kernel/ktcp.c
index e29ee0dbdfb6dfba7224f9c29cd1659f6e667aca..046861d94df7052eb37e3ed4e2be85d83cbb409c 100644 (file)
--- a/src/kernel/ktcp.c
+++ b/src/kernel/ktcp.c
@@ -48,9 +48,15 @@ struct ceph_socket *ceph_socket_create()
                return ERR_PTR(err);
        }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
        kobject_init_and_add(&s->kobj, &ceph_socket_type,
                             ceph_sockets_kobj,
                             "socket %p", s);
+#else
+       kobject_init(&s->kobj);
+       kobject_set_name(&s->kobj, "socket %p", s);
+       s->kobj.ktype = &ceph_socket_type;
+#endif
        return s;
 }
 

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index 99a65e211a73608b04864a23bb7678b2a6fa5810..c5481d59bb030ce620d070ecc9cfa2d592cbd12d 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -198,7 +198,7 @@ static void send_request(struct ceph_osd_client *osdc,
             req, req->r_tid, osd, req->r_flags);
 
        reqhead = req->r_request->front.iov_base;
-       reqhead->osdmap_epoch = osdc->osdmap->epoch;
+       reqhead->osdmap_epoch = cpu_to_le32(osdc->osdmap->epoch);
 
        req->r_request->hdr.dst.name.type =
                cpu_to_le32(CEPH_ENTITY_TYPE_OSD);