kernel: osd client bits

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 769cb5cf96c718898b08119a521b0f3382808ab0..7022da230d219434c2a8c33bafed0af59f67d011 100644 (file)
--- 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 55119f66faa8e2a009afa0bd8d970e50a2303b85..2db4b14bb606802c9f5d9934e89a6f9d5af154c0 100644 (file)
--- 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 f9d433c196700de07916657a47d593a5afcd197a..0544854dabebf3fd7a107b39a406b15afeebe996 100644 (file)
--- 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 602869b0e41411f8e0da20947c0c16610898f5eb..3f554ad9070001abc65db02a8c9d70a18551e397 100644 (file)
--- 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
 };