aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ceph/messenger.h
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2013-12-24 14:19:23 -0500
committerIlya Dryomov <ilya.dryomov@inktank.com>2013-12-31 13:32:08 -0500
commit12b4629a9fb80fecaebadc217b13b8776ed8dbef (patch)
treed4b02104183be9d6e20634812949059f4dcd70d7 /include/linux/ceph/messenger.h
parente37180c0f2f0c5b21e9295d5b19874ff4a659be1 (diff)
libceph: all features fields must be u64
In preparation for ceph_features.h update, change all features fields from unsigned int/u32 to u64. (ceph.git has ~40 feature bits at this point.) Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'include/linux/ceph/messenger.h')
-rw-r--r--include/linux/ceph/messenger.h10
1 files changed, 5 insertions, 5 deletions
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,