1 files changed, 8 insertions, 9 deletions

diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 7c1420bb1dce..d21f2dba0731 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -1,6 +1,7 @@
 #ifndef __FS_CEPH_MESSENGER_H
 #define __FS_CEPH_MESSENGER_H
 
+#include <linux/blk_types.h>
 #include <linux/kref.h>
 #include <linux/mutex.h>
 #include <linux/net.h>
@@ -60,8 +61,8 @@ struct ceph_messenger {
         u32 global_seq;
         spinlock_t global_seq_lock;
 
-        u32 supported_features;
-        u32 required_features;
+        u64 supported_features;
+        u64 required_features;
 };
 
 enum ceph_msg_data_type {
@@ -119,8 +120,7 @@ struct ceph_msg_data_cursor {
 #ifdef CONFIG_BLOCK
                 struct {                                /* bio */
                         struct bio      *bio;           /* bio from list */
-                        unsigned int    vector_index;   /* vector from bio */
-                        unsigned int    vector_offset;  /* bytes from vector */
+                        struct bvec_iter bvec_iter;
                 };
 #endif /* CONFIG_BLOCK */
                 struct {                                /* pages */
@@ -154,10 +154,9 @@ struct ceph_msg {
         struct list_head list_head;     /* links for connection lists */
 
         struct kref kref;
-        bool front_is_vmalloc;
         bool more_to_follow;
         bool needs_out_seq;
-        int front_max;
+        int front_alloc_len;
         unsigned long ack_stamp;        /* tx: when we were acked */
 
         struct ceph_msgpool *pool;
@@ -192,7 +191,7 @@ struct ceph_connection {
 
         struct ceph_entity_name peer_name; /* peer name */
 
-        unsigned peer_features;
+        u64 peer_features;
         u32 connect_seq;      /* identify the most recent connection
                                  attempt for this connection, client */
         u32 peer_global_seq;  /* peer's global seq for this connection */
@@ -256,8 +255,8 @@ extern void ceph_msgr_flush(void);
 
 extern void ceph_messenger_init(struct ceph_messenger *msgr,
                         struct ceph_entity_addr *myaddr,
-                        u32 supported_features,
-                        u32 required_features,
+                        u64 supported_features,
+                        u64 required_features,
                         bool nocrc);
 
 extern void ceph_con_init(struct ceph_connection *con, void *private,