From: Sage Weil <sage@newdream.net>
Date: Sat, 8 May 2010 04:27:57 +0000 (-0700)
Subject: poolop: make new encoding backward compatible
X-Git-Tag: v0.22~550
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6c2e1c49a963ebbc6a26077f2bb208dca2654f9;p=ceph.git

poolop: make new encoding backward compatible

This makes cea221c64 behave when messages using the old encoding (that is,
older versions of the client talk to us).
---

diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h
index c2984bb06974..e728f0491419 100644
--- a/src/messages/MPoolOp.h
+++ b/src/messages/MPoolOp.h
@@ -52,6 +52,7 @@ public:
   }
 
   void encode_payload() {
+    header.version = 2;
     paxos_encode();
     ::encode(fsid, payload);
     ::encode(pool, payload);
@@ -65,10 +66,13 @@ public:
     paxos_decode(p);
     ::decode(fsid, p);
     ::decode(pool, p);
+    if (header.version < 2)
+      ::decode(name, p);
     ::decode(op, p);
     ::decode(auid, p);
     ::decode(snapid, p);
-    ::decode(name, p);
+    if (header.version >= 2)
+      ::decode(name, p);
   }
 };