libceph: fully initialize connection in con_init()

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>

1 files changed, 3 insertions, 5 deletions

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index 6adbea78b168..ab6b24a5169e 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -142,11 +142,9 @@ static int __open_session(struct ceph_mon_client *monc)
                 monc->sub_renew_after = jiffies;  /* i.e., expired */
                 monc->want_next_osdmap = !!monc->want_next_osdmap;
 
-                ceph_con_init(&monc->client->msgr, &monc->con);
-                monc->con.private = monc;
-                monc->con.ops = &mon_con_ops;
-                monc->con.peer_name.type = CEPH_ENTITY_TYPE_MON;
-                monc->con.peer_name.num = cpu_to_le64(monc->cur_mon);
+                ceph_con_init(&monc->con, monc, &mon_con_ops,
+                        &monc->client->msgr,
+                        CEPH_ENTITY_TYPE_MON, monc->cur_mon);
 
                 dout("open_session mon%d opening\n", monc->cur_mon);
                 ceph_con_open(&monc->con,