ceph: resync headers with userland

[net-next-2.6.git] / fs / ceph / messenger.h

diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h
index a343dae73cdcf4f6f458480e4b910e5b9889093e..4e5764c7fbc2cd5496ff3c219f4fd7f2fe8809d0 100644 (file)
--- a/fs/ceph/messenger.h
+++ b/fs/ceph/messenger.h
@@ -49,10 +49,8 @@ struct ceph_connection_operations {
                                        int *skip);
 };
 
-extern const char *ceph_name_type_str(int t);
-
 /* use format string %s%d */
-#define ENTITY_NAME(n) ceph_name_type_str((n).type), le64_to_cpu((n).num)
+#define ENTITY_NAME(n) ceph_entity_type_name((n).type), le64_to_cpu((n).num)
 
 struct ceph_messenger {
        struct ceph_entity_inst inst;    /* my name+address */
@@ -86,6 +84,7 @@ struct ceph_msg {
        struct kref kref;
        bool front_is_vmalloc;
        bool more_to_follow;
+       bool needs_out_seq;
        int front_max;
 
        struct ceph_msgpool *pool;
@@ -157,7 +156,6 @@ struct ceph_connection {
        struct list_head out_queue;
        struct list_head out_sent;   /* sending or sent but unacked */
        u64 out_seq;                 /* last message queued for send */
-       u64 out_seq_sent;            /* last message sent */
        bool out_keepalive_pending;
 
        u64 in_seq, in_seq_acked;  /* last message received, acked */
@@ -233,9 +231,7 @@ extern void ceph_con_keepalive(struct ceph_connection *con);
 extern struct ceph_connection *ceph_con_get(struct ceph_connection *con);
 extern void ceph_con_put(struct ceph_connection *con);
 
-extern struct ceph_msg *ceph_msg_new(int type, int front_len,
-                                    int page_len, int page_off,
-                                    struct page **pages);
+extern struct ceph_msg *ceph_msg_new(int type, int front_len);
 extern void ceph_msg_kfree(struct ceph_msg *m);