mon: include version in monmap encoding

diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index 23ce14160cb6a1b1751adffe94d1dc7e2cc10dbb..c9d8bf9db17818d92a12f91be651e181f2d17f66 100644 (file)
--- a/src/kernel/mon_client.c
+++ b/src/kernel/mon_client.c
@@ -23,9 +23,12 @@ struct ceph_monmap *ceph_monmap_decode(void *p, void *end)
        int i, err = -EINVAL;
        ceph_fsid_t fsid;
        u32 epoch, num_mon;
+       u16 version;
 
        dout("monmap_decode %p %p len %d\n", p, end, (int)(end-p));
 
+       ceph_decode_32_safe(&p, end, version, bad);
+
        ceph_decode_need(&p, end, 2*sizeof(u32) + 2*sizeof(u64), bad);
        ceph_decode_copy(&p, &fsid, sizeof(fsid));
        ceph_decode_32(&p, epoch);

diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h
index 231ebeab4028197487bea22160b112a4402a6d28..ba63408bb4c4a7d9f2710f7f2e5f85a1ceca6d52 100644 (file)
--- a/src/mon/MonMap.h
+++ b/src/mon/MonMap.h
@@ -82,6 +82,8 @@ class MonMap {
   }
 
   void encode(bufferlist& blist) {
+    __u16 v = 1;
+    ::encode(v, blist);
     ::encode_raw(fsid, blist);
     ::encode(epoch, blist);
     ::encode(mon_inst, blist);
@@ -91,6 +93,8 @@ class MonMap {
     decode(p);
   }
   void decode(bufferlist::iterator &p) {
+    __u16 v;
+    ::decode(v, p);
     ::decode_raw(fsid, p);
     ::decode(epoch, p);
     ::decode(mon_inst, p);