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

mds: ETableServer event now uses modern encoding

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

diff --git a/src/mds/events/ETableServer.h b/src/mds/events/ETableServer.h
index 6818e8557ba9..d66dff711726 100644
--- a/src/mds/events/ETableServer.h
+++ b/src/mds/events/ETableServer.h
@@ -36,8 +36,7 @@ struct ETableServer : public LogEvent {
     table(t), op(o), reqid(ri), bymds(m), tid(ti), version(v) { }
 
   void encode(bufferlist& bl) const {
-    __u8 struct_v = 2;
-    ::encode(struct_v, bl);
+    ENCODE_START(3, 3, bl);
     ::encode(stamp, bl);
     ::encode(table, bl);
     ::encode(op, bl);
@@ -46,10 +45,10 @@ struct ETableServer : public LogEvent {
     ::encode(mutation, bl);
     ::encode(tid, bl);
     ::encode(version, bl);
+    ENCODE_FINISH(bl);
   }
   void decode(bufferlist::iterator &bl) {
-    __u8 struct_v;
-    ::decode(struct_v, bl);
+    DECODE_START_LEGACY_COMPAT_LEN(3, 3, 3, bl);
     if (struct_v >= 2)
       ::decode(stamp, bl);
     ::decode(table, bl);
@@ -59,6 +58,7 @@ struct ETableServer : public LogEvent {
     ::decode(mutation, bl);
     ::decode(tid, bl);
     ::decode(version, bl);
+    DECODE_FINISH(bl);
   }
 
   void print(ostream& out) {