summaryrefslogtreecommitdiff
path: root/fs/ceph/msgr.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-01-27 14:28:10 -0800
committerSage Weil <sage@newdream.net>2010-01-29 12:41:09 -0800
commitac8839d7b264d0fa478fca7c4f9b6bb833540a80 (patch)
treec5dd4fbc61c2f96845c9198a6eb9840074ebcb8c /fs/ceph/msgr.h
parent361be8601d78e488b5249032cc4e779b81d7928e (diff)
ceph: include type in ceph_entity_addr, filepath
Include a type/version in ceph_entity_addr and filepath. Include extra byte in filepath encoding as necessary. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/msgr.h')
-rw-r--r--fs/ceph/msgr.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ceph/msgr.h b/fs/ceph/msgr.h
index 40b6189aa9e3..8aaab414f3f8 100644
--- 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,7 +61,8 @@ extern const char *ceph_entity_type_name(int type);
* entity_addr -- network address
*/
struct ceph_entity_addr {
- __le64 nonce; /* unique id for process (e.g. pid) */
+ __le32 type;
+ __le32 nonce; /* unique id for process (e.g. pid) */
struct sockaddr_storage in_addr;
} __attribute__ ((packed));