diff options
author | Alex Elder <elder@inktank.com> | 2012-05-27 00:26:43 -0400 |
---|---|---|
committer | Alex Elder <elder@dreamhost.com> | 2012-06-01 09:37:56 -0400 |
commit | 15d9882c336db2db73ccf9871ae2398e452f694c (patch) | |
tree | cfa0c726a69b68f51b344d50114a2961019c1231 /include | |
parent | e22004235a900213625acd6583ac913d5a30c155 (diff) |
libceph: embed ceph messenger structure in ceph_client
A ceph client has a pointer to a ceph messenger structure in it.
There is always exactly one ceph messenger for a ceph client, so
there is no need to allocate it separate from the ceph client
structure.
Switch the ceph_client structure to embed its ceph_messenger
structure.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ceph/libceph.h | 2 | ||||
-rw-r--r-- | include/linux/ceph/messenger.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 92eef7c3d3c5..927361c4b0a8 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h | |||
@@ -131,7 +131,7 @@ struct ceph_client { | |||
131 | u32 supported_features; | 131 | u32 supported_features; |
132 | u32 required_features; | 132 | u32 required_features; |
133 | 133 | ||
134 | struct ceph_messenger *msgr; /* messenger instance */ | 134 | struct ceph_messenger msgr; /* messenger instance */ |
135 | struct ceph_mon_client monc; | 135 | struct ceph_mon_client monc; |
136 | struct ceph_osd_client osdc; | 136 | struct ceph_osd_client osdc; |
137 | 137 | ||
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 74f6c9bd8074..3fbd4be804ed 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h | |||
@@ -211,10 +211,11 @@ extern int ceph_msgr_init(void); | |||
211 | extern void ceph_msgr_exit(void); | 211 | extern void ceph_msgr_exit(void); |
212 | extern void ceph_msgr_flush(void); | 212 | extern void ceph_msgr_flush(void); |
213 | 213 | ||
214 | extern struct ceph_messenger *ceph_messenger_create( | 214 | extern void ceph_messenger_init(struct ceph_messenger *msgr, |
215 | struct ceph_entity_addr *myaddr, | 215 | struct ceph_entity_addr *myaddr, |
216 | u32 features, u32 required); | 216 | u32 supported_features, |
217 | extern void ceph_messenger_destroy(struct ceph_messenger *); | 217 | u32 required_features, |
218 | bool nocrc); | ||
218 | 219 | ||
219 | extern void ceph_con_init(struct ceph_messenger *msgr, | 220 | extern void ceph_con_init(struct ceph_messenger *msgr, |
220 | struct ceph_connection *con); | 221 | struct ceph_connection *con); |