diff options
| author | Alex Elder <elder@inktank.com> | 2012-05-26 23:26:43 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:23 -0800 |
| commit | 6880138c03448b3c375a3d7a8ef6acd688e6fb40 (patch) | |
| tree | 32fcab0d28584b1ba13756cbdfd4f870065ecd69 /include | |
| parent | 9403ae33bf946342b23cfe3dbf3e4c9b86860c97 (diff) | |
| download | linux-3.10-6880138c03448b3c375a3d7a8ef6acd688e6fb40.tar.gz linux-3.10-6880138c03448b3c375a3d7a8ef6acd688e6fb40.tar.bz2 linux-3.10-6880138c03448b3c375a3d7a8ef6acd688e6fb40.zip | |
libceph: fully initialize connection in con_init()
(cherry picked from commit 1bfd89f4e6e1adc6a782d94aa5d4c53be1e404d7)
Move the initialization of a ceph connection's private pointer,
operations vector pointer, and peer name information into
ceph_con_init(). Rearrange the arguments so the connection pointer
is first. Hide the byte-swapping of the peer entity number inside
ceph_con_init()
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/messenger.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 5f30c81d474..7ed7a87aa6b 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -219,8 +219,10 @@ extern void ceph_messenger_init(struct ceph_messenger *msgr, u32 required_features, bool nocrc); -extern void ceph_con_init(struct ceph_messenger *msgr, - struct ceph_connection *con); +extern void ceph_con_init(struct ceph_connection *con, void *private, + const struct ceph_connection_operations *ops, + struct ceph_messenger *msgr, __u8 entity_type, + __u64 entity_num); extern void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr); extern bool ceph_con_opened(struct ceph_connection *con); |