summaryrefslogtreecommitdiffstats
path: root/net/ceph/mon_client.c
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-06-27 12:24:08 -0700
committerSage Weil <sage@inktank.com>2012-07-05 21:14:35 -0700
commitb7a9e5dd40f17a48a72f249b8bbc989b63bae5fd (patch)
treef4951e53776e2ec45f9b539b786be67c8a7f42a2 /net/ceph/mon_client.c
parent261030215d970c62f799e6e508e3c68fc7ec2aa9 (diff)
downloadlinux-b7a9e5dd40f17a48a72f249b8bbc989b63bae5fd.tar.gz
linux-b7a9e5dd40f17a48a72f249b8bbc989b63bae5fd.tar.bz2
linux-b7a9e5dd40f17a48a72f249b8bbc989b63bae5fd.zip
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>
Diffstat (limited to 'net/ceph/mon_client.c')
-rw-r--r--net/ceph/mon_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index e9db3de20b2e..bcc80a0e2a98 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -143,11 +143,11 @@ static int __open_session(struct ceph_mon_client *monc)
monc->want_next_osdmap = !!monc->want_next_osdmap;
ceph_con_init(&monc->con, monc, &mon_con_ops,
- &monc->client->msgr,
- CEPH_ENTITY_TYPE_MON, monc->cur_mon);
+ &monc->client->msgr);
dout("open_session mon%d opening\n", monc->cur_mon);
ceph_con_open(&monc->con,
+ CEPH_ENTITY_TYPE_MON, monc->cur_mon,
&monc->monmap->mon_inst[monc->cur_mon].addr);
/* initiatiate authentication handshake */