From: Greg Farnum <greg@inktank.com>
Date: Thu, 17 Jan 2013 00:51:17 +0000 (-0800)
Subject: mds: modernize SimpleLock on-wire encoding
X-Git-Tag: v0.58~100^2~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78632adca12f747f8c37acf4fe9d1ace2b5db781;p=ceph.git

mds: modernize SimpleLock on-wire encoding

This is a wire protocol change.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index 8eb813469e4c0..0eff040845f8f 100644
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -544,22 +544,22 @@ public:
 
   // encode/decode
   void encode(bufferlist& bl) const {
-    __u8 struct_v = 1;
-    ::encode(struct_v, bl);
+    ENCODE_START(2, 2, bl);
     ::encode(state, bl);
     if (have_more())
       ::encode(more()->gather_set, bl);
     else
       ::encode(empty_gather_set, bl);
+    ENCODE_FINISH(bl);
   }
   void decode(bufferlist::iterator& p) {
-    __u8 struct_v;
-    ::decode(struct_v, p);
+    DECODE_START(2, p);
     ::decode(state, p);
     set<int> g;
     ::decode(g, p);
     if (!g.empty())
       more()->gather_set.swap(g);
+    DECODE_FINISH(p);
   }
   void encode_state_for_replica(bufferlist& bl) const {
     __s16 s = get_replica_state();