From: Greg Farnum <greg@inktank.com>
Date: Fri, 18 Jan 2013 21:05:24 +0000 (-0800)
Subject: mds: ESubtreeMap event now uses modern encoding
X-Git-Tag: v0.58~100^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7998524ddfc6b8805362190e368c8db89d06cdf3;p=ceph.git

mds: ESubtreeMap event now uses modern encoding

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mds/events/ESubtreeMap.h b/src/mds/events/ESubtreeMap.h
index 0230de1a59ef..72d9a8c315d9 100644
--- a/src/mds/events/ESubtreeMap.h
+++ b/src/mds/events/ESubtreeMap.h
@@ -34,17 +34,16 @@ public:
   }
 
   void encode(bufferlist& bl) const {
-    __u8 struct_v = 4;
-    ::encode(struct_v, bl);
+    ENCODE_START(5, 5, bl);
     ::encode(stamp, bl);
     ::encode(metablob, bl);
     ::encode(subtrees, bl);
     ::encode(ambiguous_subtrees, bl);
     ::encode(expire_pos, bl);
+    ENCODE_FINISH(bl);
   } 
   void decode(bufferlist::iterator &bl) {
-    __u8 struct_v;
-    ::decode(struct_v, bl);
+    DECODE_START_LEGACY_COMPAT_LEN(5, 5, 5, bl);
     if (struct_v >= 2)
       ::decode(stamp, bl);
     ::decode(metablob, bl);
@@ -53,6 +52,7 @@ public:
       ::decode(ambiguous_subtrees, bl);
     if (struct_v >= 3)
       ::decode(expire_pos, bl);
+    DECODE_FINISH(bl);
   }
 
   void replay(MDS *mds);