Merge tag 'v3.5-rc1'

Linux 3.5-rc1

Conflicts:
	net/ceph/messenger.c

diff --cc include/linux/ceph/libceph.h
Simple merge

diff --cc net/ceph/ceph_common.c
Simple merge

diff --cc net/ceph/messenger.c
index bdbecac2d69db2d50587b34774f2f17a5c87ec06,524f4e4f598b845a7242c0243efb1a4e6a843955..5e9f61d6d2340ef932068dc88d65609b593d4f63
--- 1/net/ceph/messenger.c
--- 2/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@@ -1749,8 -1666,9 +1749,8 @@@ static int read_partial_message(struct 
        int size;
        int end;
        int ret;
-       unsigned front_len, middle_len, data_len;
+       unsigned int front_len, middle_len, data_len;
        bool do_datacrc = !con->msgr->nocrc;
 -      int skip;
        u64 seq;
        u32 crc;
  
@@@ -2459,27 -2373,17 +2459,27 @@@ void ceph_msg_revoke(struct ceph_msg *m
  /*
   * Revoke a message that we may be reading data into
   */
 -void ceph_con_revoke_message(struct ceph_connection *con, struct ceph_msg *msg)
 +void ceph_msg_revoke_incoming(struct ceph_msg *msg)
  {
 +      struct ceph_connection *con;
 +
 +      BUG_ON(msg == NULL);
 +      if (!msg->con) {
 +              dout("%s msg %p null con\n", __func__, msg);
 +
 +              return;         /* Message not in our possession */
 +      }
 +
 +      con = msg->con;
        mutex_lock(&con->mutex);
 -      if (con->in_msg && con->in_msg == msg) {
 +      if (con->in_msg == msg) {
-               unsigned front_len = le32_to_cpu(con->in_hdr.front_len);
-               unsigned middle_len = le32_to_cpu(con->in_hdr.middle_len);
-               unsigned data_len = le32_to_cpu(con->in_hdr.data_len);
+               unsigned int front_len = le32_to_cpu(con->in_hdr.front_len);
+               unsigned int middle_len = le32_to_cpu(con->in_hdr.middle_len);
+               unsigned int data_len = le32_to_cpu(con->in_hdr.data_len);
  
                /* skip rest of message */
 -              dout("con_revoke_pages %p msg %p revoked\n", con, msg);
 -                      con->in_base_pos = con->in_base_pos -
 +              dout("%s %p msg %p revoked\n", __func__, con, msg);
 +              con->in_base_pos = con->in_base_pos -
                                sizeof(struct ceph_msg_header) -
                                front_len -
                                middle_len -

diff --cc net/ceph/mon_client.c
Simple merge

diff --cc net/ceph/osd_client.c
Simple merge

diff --cc net/ceph/osdmap.c
Simple merge