From: Sage Weil <sage@newdream.net>
Date: Mon, 20 Jul 2009 20:39:55 +0000 (-0700)
Subject: mon: include version in monmap encoding
X-Git-Tag: v0.11~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a451157a6798ab2b4d151edb84e3ee0ff9296d8a;p=ceph.git

mon: include version in monmap encoding
---

diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index 23ce14160cb6..c9d8bf9db178 100644
--- 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 231ebeab4028..ba63408bb4c4 100644
--- 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);