From 3d7aec0d3ae9f44ba39ae42f0d5db96000f1d025 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 20 Dec 2007 15:53:52 -0800
Subject: [PATCH] kernel: osd client bits

---
 src/include/ceph_fs.h   | 15 +--------------
 src/kernel/mds_client.c | 14 +++++++-------
 src/kernel/osd_client.c |  1 +
 src/kernel/osd_client.h | 13 +++++++++++++
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 769cb5cf96c71..7022da230d219 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -130,22 +130,9 @@ typedef union ceph_pg ceph_pg_t;
 struct ceph_object_layout {
 	ceph_pg_t pgid;
 	__u32     stripe_unit;  
-};
+} __attribute__ ((packed));
 typedef struct ceph_object_layout ceph_object_layout_t;
 
-
-/*
- * object extent
- */
-struct ceph_object_extent {
-	ceph_object_t oe_oid;
-	__u64 oe_start;
-	__u64 oe_length;
-	struct ceph_object_layout oe_object_layout;
-	
-	/* buffer extent reverse mapping? */
-};
-
 /*
  * compound epoch+version, used by rados to serialize mutations
  */
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 55119f66faa8e..2db4b14bb6068 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -312,7 +312,7 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc, struct ceph_msg *msg,
 	struct ceph_msg *reply = 0;
 	int err;
 
-	dout(30, "mdsc_do_request on %p type %d\n", msg, msg->hdr.type);
+	dout(30, "do_request on %p type %d\n", msg, msg->hdr.type);
 
 	spin_lock(&mdsc->lock);
 	req = register_request(mdsc, msg, mds);
@@ -322,16 +322,16 @@ retry:
 	if (mds < 0) {
 		/* wait for new mdsmap */
 		spin_unlock(&mdsc->lock);
-		dout(30, "mdsc_do_request waiting for new mdsmap\n");
+		dout(30, "do_request waiting for new mdsmap\n");
 		wait_for_new_map(mdsc);
 		spin_lock(&mdsc->lock);
 		goto retry;
 	}
-	dout(30, "mdsc_do_request chose mds%d\n", mds);
+	dout(30, "do_request chose mds%d\n", mds);
 
 	/* get session */
 	session = get_session(mdsc, mds);
-	dout(30, "mdsc_do_request session %p\n", session);
+	dout(30, "do_request session %p\n", session);
 
 	/* open? */
 	if (mdsc->sessions[mds]->s_state == CEPH_MDS_SESSION_IDLE) 
@@ -339,9 +339,9 @@ retry:
 	if (mdsc->sessions[mds]->s_state != CEPH_MDS_SESSION_OPEN) {
 		/* wait for session to open (or fail, or close) */
 		spin_unlock(&mdsc->lock);
-		dout(30, "mdsc_do_request waiting on session %p\n", session);
+		dout(30, "do_request waiting on session %p\n", session);
 		wait_for_completion(&session->s_completion);
-		dout(30, "mdsc_do_request done waiting on session %p\n", session);
+		dout(30, "do_request done waiting on session %p\n", session);
 		put_session(session);
 		spin_lock(&mdsc->lock);
 		goto retry;
@@ -373,7 +373,7 @@ retry:
 	if ((err = ceph_mdsc_parse_reply_info(reply, rinfo)) < 0)
 		return err;
 
-	dout(30, "mdsc_do_request done on %p\n", msg);
+	dout(30, "do_request done on %p\n", msg);
 	return 0;
 }
 
diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index f9d433c196700..0544854dabebf 100644
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -133,3 +133,4 @@ ceph_osdc_create_request(struct ceph_osd_client *osdc, int op)
 	
 	return req;
 }
+
diff --git a/src/kernel/osd_client.h b/src/kernel/osd_client.h
index 602869b0e4141..3f554ad907000 100644
--- a/src/kernel/osd_client.h
+++ b/src/kernel/osd_client.h
@@ -11,6 +11,19 @@
 
 struct ceph_msg;
 
+/*
+ * object extent
+ */
+struct ceph_object_extent {
+	ceph_object_t oid;
+	__u64 start;
+	__u64 length;
+	ceph_object_layout_t layout;
+};
+
+/*
+ * pending request 
+ */
 enum {
 	REQUEST_ACK, REQUEST_SAFE
 };
-- 
2.39.5