Merge branch 'unstable' into io

Conflicts:

	src/kernel/messenger.c

diff --cc src/TODO
Simple merge

diff --cc src/kernel/inode.c
Simple merge

diff --cc src/kernel/messenger.c
index 6fbfed4d5adc7bad9c002b7c888af0060cc23ad6,1dcaa09d57e1b3234ecc3e58a467a913c3d7a31f..a999d466913fe744849a817fa7f1e50ccfc2e2cd
--- 1/src/kernel/messenger.c
--- 2/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@@ -676,12 -669,10 +666,11 @@@ static int read_message_partial(struct 
        while (con->in_msg_pos.data_pos < data_len) {
                left = min((int)(data_len - con->in_msg_pos.data_pos),
                           (int)(PAGE_SIZE - con->in_msg_pos.page_pos));
-               /*dout(10, "data_pos = %d, data_len = %d, page_pos=%d left = %d\n", 
-                 con->in_msg_pos.data_pos, m->hdr.data_len, con->in_msg_pos.page_pos, left);*/
                p = kmap(m->pages[con->in_msg_pos.page]);
-               ret = ceph_tcp_recvmsg(con->sock, p + con->in_msg_pos.page_pos, left);
-               if (ret <= 0)
+               ret = ceph_tcp_recvmsg(con->sock, p + con->in_msg_pos.page_pos,
+                                      left);
 -              if (ret <= 0) return ret;
++              if (ret <= 0) 
 +                      return ret;
                con->in_msg_pos.data_pos += ret;
                con->in_msg_pos.page_pos += ret;
                if (con->in_msg_pos.page_pos == PAGE_SIZE) {

diff --cc src/kernel/osd_client.c
Simple merge

diff --cc src/kernel/super.h
Simple merge