Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull last minute Ceph fixes from Sage Weil:
 "The important one fixes a bug in the socket failure handling behavior
  that was turned up in some recent failure injection testing.  The
  other two are minor bug fixes."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: endian bug in rbd_req_cb()
  rbd: Fix ceph_snap_context size calculation
  libceph: fix messenger retry

3 files changed, 10 insertions, 18 deletions

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 65665c9c42c6..8f428a8ab003 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -499,7 +499,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
                          / sizeof (*ondisk))
                 return -EINVAL;
         header->snapc = kmalloc(sizeof(struct ceph_snap_context) +
-                                snap_count * sizeof (*ondisk),
+                                snap_count * sizeof(u64),
                                 gfp_flags);
         if (!header->snapc)
                 return -ENOMEM;
@@ -977,7 +977,7 @@ static void rbd_req_cb(struct ceph_osd_request *req, struct ceph_msg *msg)
         op = (void *)(replyhead + 1);
         rc = le32_to_cpu(replyhead->result);
         bytes = le64_to_cpu(op->extent.length);
-        read_op = (le32_to_cpu(op->op) == CEPH_OSD_OP_READ);
+        read_op = (le16_to_cpu(op->op) == CEPH_OSD_OP_READ);
 
         dout("rbd_req_cb bytes=%lld readop=%d rc=%d\n", bytes, read_op, rc);
 
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index 2521a95fa6d9..44c87e731e9d 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -163,16 +163,8 @@ struct ceph_connection {
 
         /* connection negotiation temps */
         char in_banner[CEPH_BANNER_MAX_LEN];
-        union {
-                struct {  /* outgoing connection */
-                        struct ceph_msg_connect out_connect;
-                        struct ceph_msg_connect_reply in_reply;
-                };
-                struct {  /* incoming */
-                        struct ceph_msg_connect in_connect;
-                        struct ceph_msg_connect_reply out_reply;
-                };
-        };
+        struct ceph_msg_connect out_connect;
+        struct ceph_msg_connect_reply in_reply;
         struct ceph_entity_addr actual_peer_addr;
 
         /* message out temps */
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index b332c3d76059..10255e81be79 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -1423,7 +1423,7 @@ static int process_connect(struct ceph_connection *con)
                  * dropped messages.
                  */
                 dout("process_connect got RESET peer seq %u\n",
-                     le32_to_cpu(con->in_connect.connect_seq));
+                     le32_to_cpu(con->in_reply.connect_seq));
                 pr_err("%s%lld %s connection reset\n",
                        ENTITY_NAME(con->peer_name),
                        ceph_pr_addr(&con->peer_addr.in_addr));
@@ -1450,10 +1450,10 @@ static int process_connect(struct ceph_connection *con)
                  * If we sent a smaller connect_seq than the peer has, try
                  * again with a larger value.
                  */
-                dout("process_connect got RETRY my seq = %u, peer_seq = %u\n",
+                dout("process_connect got RETRY_SESSION my seq %u, peer %u\n",
                      le32_to_cpu(con->out_connect.connect_seq),
-                     le32_to_cpu(con->in_connect.connect_seq));
-                con->connect_seq = le32_to_cpu(con->in_connect.connect_seq);
+                     le32_to_cpu(con->in_reply.connect_seq));
+                con->connect_seq = le32_to_cpu(con->in_reply.connect_seq);
                 ceph_con_out_kvec_reset(con);
                 ret = prepare_write_connect(con);
                 if (ret < 0)
@@ -1468,9 +1468,9 @@ static int process_connect(struct ceph_connection *con)
                  */
                 dout("process_connect got RETRY_GLOBAL my %u peer_gseq %u\n",
                      con->peer_global_seq,
-                     le32_to_cpu(con->in_connect.global_seq));
+                     le32_to_cpu(con->in_reply.global_seq));
                 get_global_seq(con->msgr,
-                               le32_to_cpu(con->in_connect.global_seq));
+                               le32_to_cpu(con->in_reply.global_seq));
                 ceph_con_out_kvec_reset(con);
                 ret = prepare_write_connect(con);
                 if (ret < 0)