aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ceph
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/ceph')
-rw-r--r--include/linux/ceph/libceph.h8
-rw-r--r--include/linux/ceph/messenger.h10
2 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 2e3024881a5e..7d704db60cbb 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -122,8 +122,8 @@ struct ceph_client {
122 122
123 int (*extra_mon_dispatch)(struct ceph_client *, struct ceph_msg *); 123 int (*extra_mon_dispatch)(struct ceph_client *, struct ceph_msg *);
124 124
125 u32 supported_features; 125 u64 supported_features;
126 u32 required_features; 126 u64 required_features;
127 127
128 struct ceph_messenger msgr; /* messenger instance */ 128 struct ceph_messenger msgr; /* messenger instance */
129 struct ceph_mon_client monc; 129 struct ceph_mon_client monc;
@@ -192,8 +192,8 @@ extern int ceph_compare_options(struct ceph_options *new_opt,
192 struct ceph_client *client); 192 struct ceph_client *client);
193extern struct ceph_client *ceph_create_client(struct ceph_options *opt, 193extern struct ceph_client *ceph_create_client(struct ceph_options *opt,
194 void *private, 194 void *private,
195 unsigned supported_features, 195 u64 supported_features,
196 unsigned required_features); 196 u64 required_features);
197extern u64 ceph_client_id(struct ceph_client *client); 197extern u64 ceph_client_id(struct ceph_client *client);
198extern void ceph_destroy_client(struct ceph_client *client); 198extern void ceph_destroy_client(struct ceph_client *client);
199extern int __ceph_open_session(struct ceph_client *client, 199extern int __ceph_open_session(struct ceph_client *client,
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 7c1420bb1dce..c1d3f5a65273 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -60,8 +60,8 @@ struct ceph_messenger {
60 u32 global_seq; 60 u32 global_seq;
61 spinlock_t global_seq_lock; 61 spinlock_t global_seq_lock;
62 62
63 u32 supported_features; 63 u64 supported_features;
64 u32 required_features; 64 u64 required_features;
65}; 65};
66 66
67enum ceph_msg_data_type { 67enum ceph_msg_data_type {
@@ -192,7 +192,7 @@ struct ceph_connection {
192 192
193 struct ceph_entity_name peer_name; /* peer name */ 193 struct ceph_entity_name peer_name; /* peer name */
194 194
195 unsigned peer_features; 195 u64 peer_features;
196 u32 connect_seq; /* identify the most recent connection 196 u32 connect_seq; /* identify the most recent connection
197 attempt for this connection, client */ 197 attempt for this connection, client */
198 u32 peer_global_seq; /* peer's global seq for this connection */ 198 u32 peer_global_seq; /* peer's global seq for this connection */
@@ -256,8 +256,8 @@ extern void ceph_msgr_flush(void);
256 256
257extern void ceph_messenger_init(struct ceph_messenger *msgr, 257extern void ceph_messenger_init(struct ceph_messenger *msgr,
258 struct ceph_entity_addr *myaddr, 258 struct ceph_entity_addr *myaddr,
259 u32 supported_features, 259 u64 supported_features,
260 u32 required_features, 260 u64 required_features,
261 bool nocrc); 261 bool nocrc);
262 262
263extern void ceph_con_init(struct ceph_connection *con, void *private, 263extern void ceph_con_init(struct ceph_connection *con, void *private,