Merge branch 'master' into for-2.6.35

[safe/jmp/linux-2.6] / fs / ceph / msgr.h

diff --git a/fs/ceph/msgr.h b/fs/ceph/msgr.h
index be83f93..8aaab41 100644 (file)
--- a/fs/ceph/msgr.h
+++ b/fs/ceph/msgr.h
@@ -21,7 +21,7 @@
  * whenever the wire protocol changes.  try to keep this string length
  * constant.
  */
-#define CEPH_BANNER "ceph v026"
+#define CEPH_BANNER "ceph v027"
 #define CEPH_BANNER_MAX_LEN 30
 
 
@@ -61,24 +61,11 @@ extern const char *ceph_entity_type_name(int type);
  * entity_addr -- network address
  */
 struct ceph_entity_addr {
-       __le32 erank;  /* entity's rank in process */
+       __le32 type;
        __le32 nonce;  /* unique id for process (e.g. pid) */
        struct sockaddr_storage in_addr;
 } __attribute__ ((packed));
 
-static inline bool ceph_entity_addr_is_local(const struct ceph_entity_addr *a,
-                                            const struct ceph_entity_addr *b)
-{
-       return a->nonce == b->nonce &&
-               memcmp(&a->in_addr, &b->in_addr, sizeof(a->in_addr)) == 0;
-}
-
-static inline bool ceph_entity_addr_equal(const struct ceph_entity_addr *a,
-                                         const struct ceph_entity_addr *b)
-{
-       return memcmp(a, b, sizeof(*a)) == 0;
-}
-
 struct ceph_entity_inst {
        struct ceph_entity_name name;
        struct ceph_entity_addr addr;
@@ -147,7 +134,7 @@ struct ceph_msg_header {
                             receiver: mask against ~PAGE_MASK */
 
        struct ceph_entity_inst src, orig_src;
-       __le32 dst_erank;
+       __le32 reserved;
        __le32 crc;       /* header crc32c */
 } __attribute__ ((packed));