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>

3 files changed, 13 insertions, 11 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 36b440a00cc2..3b65f6e6911b 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -521,15 +521,22 @@ void ceph_con_put(struct ceph_connection *con)
 /*
  * initialize a new connection.
  */
-void ceph_con_init(struct ceph_messenger *msgr, struct ceph_connection *con)
+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)
 {
         dout("con_init %p\n", con);
         memset(con, 0, sizeof(*con));
+        con->private = private;
+        con->ops = ops;
         atomic_set(&con->nref, 1);
         con->msgr = msgr;
 
         con_sock_state_init(con);
 
+        con->peer_name.type = (__u8) entity_type;
+        con->peer_name.num = cpu_to_le64(entity_num);
+
         mutex_init(&con->mutex);
         INIT_LIST_HEAD(&con->out_queue);
         INIT_LIST_HEAD(&con->out_sent);
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,
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 5b41a6929cd9..448c9da8beff 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -640,11 +640,8 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum)
         INIT_LIST_HEAD(&osd->o_osd_lru);
         osd->o_incarnation = 1;
 
-        ceph_con_init(&osdc->client->msgr, &osd->o_con);
-        osd->o_con.private = osd;
-        osd->o_con.ops = &osd_con_ops;
-        osd->o_con.peer_name.type = CEPH_ENTITY_TYPE_OSD;
-        osd->o_con.peer_name.num = cpu_to_le64(onum);
+        ceph_con_init(&osd->o_con, osd, &osd_con_ops, &osdc->client->msgr,
+                CEPH_ENTITY_TYPE_OSD, onum);
 
         INIT_LIST_HEAD(&osd->o_keepalive_item);
         return osd;