From: Sage Weil <sage@newdream.net>
Date: Tue, 27 May 2008 20:04:45 +0000 (-0700)
Subject: kclient: fix up kobj for 2.6.24
X-Git-Tag: v0.3~181
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c2febcb3e2d1b07b333c15824d7343e64b90b1e;p=ceph.git

kclient: fix up kobj for 2.6.24
---

diff --git a/src/kernel/ktcp.c b/src/kernel/ktcp.c
index e29ee0dbdfb..046861d94df 100644
--- 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 99a65e211a7..c5481d59bb0 100644
--- 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);