libceph: set peer name on con_open, not init

The peer name may change on each open attempt, even when the connection is
reused.

Signed-off-by: Sage Weil <sage@inktank.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index ecd7f15741c1..5ac6434185ae 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -394,8 +394,7 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc,
         s->s_seq = 0;
         mutex_init(&s->s_mutex);
 
-        ceph_con_init(&s->s_con, s, &mds_con_ops, &mdsc->fsc->client->msgr,
-                CEPH_ENTITY_TYPE_MDS, mds);
+        ceph_con_init(&s->s_con, s, &mds_con_ops, &mdsc->fsc->client->msgr);
 
         spin_lock_init(&s->s_gen_ttl_lock);
         s->s_cap_gen = 0;
@@ -437,7 +436,8 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc,
         mdsc->sessions[mds] = s;
         atomic_inc(&s->s_ref);  /* one ref to sessions[], one to caller */
 
-        ceph_con_open(&s->s_con, ceph_mdsmap_get_addr(mdsc->mdsmap, mds));
+        ceph_con_open(&s->s_con, CEPH_ENTITY_TYPE_MDS, mds,
+                      ceph_mdsmap_get_addr(mdsc->mdsmap, mds));
 
         return s;
 
@@ -2529,6 +2529,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,
         session->s_seq = 0;
 
         ceph_con_open(&session->s_con,
+                      CEPH_ENTITY_TYPE_MDS, mds,
                       ceph_mdsmap_get_addr(mdsc->mdsmap, mds));
 
         /* replay unsafe requests */