Merge branch 'master' into rados

Conflicts:

	src/include/ceph_fs.h

diff --cc src/include/ceph_fs.h
index c148a6481c2e8f1e6dfa10abc7b1181a4c7057ac,e10b74be5927d34e8629607b27bac23cd1f56673..f2155822ed0aa931d1b005a25cfb100a33cdc1e3
--- 1/src/include/ceph_fs.h
--- 2/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@@ -228,10 -227,10 +228,10 @@@ struct ceph_msg_header 
        __u32 seq;    /* message seq# for this session */
        __u32 type;   /* message type */
        struct ceph_entity_inst src, dst;
-       __u16 front_len;
-       __u16 data_off;  /* sender: include full offset; receiver: mask against ~PAGE_MASK */
+       __u32 front_len;
 -      __u32 data_off;  /* sender: include full offset; receiver: mask against PAGE_MASK */
++      __u32 data_off;  /* sender: include full offset; receiver: mask against ~PAGE_MASK */
        __u32 data_len;  /* bytes of data payload */
- };
+ } __attribute__ ((packed));
  
  
  /*

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

diff --cc src/msg/SimpleMessenger.cc
Simple merge