diff options
author | Sage Weil <sage@inktank.com> | 2012-06-27 12:24:08 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:37 -0800 |
commit | 638ba1765d03bdc3a972bfca69fd0a4a4eda717c (patch) | |
tree | 75da2d47d2997f1a2800dbc7bea2f4d5520f47bf /include | |
parent | db90f992eb77188ce3e2b95d36f99ba194e04e66 (diff) | |
download | linux-3.10-638ba1765d03bdc3a972bfca69fd0a4a4eda717c.tar.gz linux-3.10-638ba1765d03bdc3a972bfca69fd0a4a4eda717c.tar.bz2 linux-3.10-638ba1765d03bdc3a972bfca69fd0a4a4eda717c.zip |
libceph: set peer name on con_open, not init
(cherry picked from commit b7a9e5dd40f17a48a72f249b8bbc989b63bae5fd)
The peer name may change on each open attempt, even when the connection is
reused.
Signed-off-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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 6a00acc61d4..ec22abd51fa 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -224,9 +224,9 @@ extern void ceph_messenger_init(struct ceph_messenger *msgr, 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); + struct ceph_messenger *msgr); extern void ceph_con_open(struct ceph_connection *con, + __u8 entity_type, __u64 entity_num, struct ceph_entity_addr *addr); extern bool ceph_con_opened(struct ceph_connection *con); extern void ceph_con_close(struct ceph_connection *con); |