From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 25 Jun 2009 19:05:15 +0000 (-0700)
Subject: messages/MClass[Ack]: Roll back some unification.
X-Git-Tag: v0.10~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cff3f6f99ba23e0fa2e5753669f9bcb8464854ff;p=ceph.git

messages/MClass[Ack]: Roll back some unification.
version_t last and PaxosServiceMessage::version shouldn't
be the same in these messages. Remove that and add a new
constructor that does set the version (but it's unneeded).
---

diff --git a/src/messages/MClass.h b/src/messages/MClass.h
index ecd1314a8d45..b969292af17a 100644
--- a/src/messages/MClass.h
+++ b/src/messages/MClass.h
@@ -35,13 +35,15 @@ public:
   __s32 action;
 
 
-  MClass() : PaxosServiceMessage(MSG_CLASS, 0) {}
+  MClass() : PaxosServiceMessage(MSG_CLASS, 0), {}
 #if 0
   MClass(ceph_fsid_t& f, deque<ClassLibraryIncremental>& e) :
     PaxosServiceMessage(MSG_CLASS, 0),
     fsid(f), entries(e), last(0), action(0) {}
 #endif
-  MClass(ceph_fsid_t& f, version_t l) : PaxosServiceMessage(MSG_CLASS, l), fsid(f), last(l) {}
+  MClass(ceph_fsid_t& f, version_t l) : PaxosServiceMessage(MSG_CLASS, VERSION_T), fsid(f), last(l) {}
+  MClass(ceph_fsid_t& f, version_t l, version_t paxos_version) :
+    PaxosServiceMessage(MSG_CLASS, paxos_version), fsid(f), last(l) {}
 
   const char *get_type_name() { return "class"; }
   void print(ostream& out) {
diff --git a/src/messages/MClassAck.h b/src/messages/MClassAck.h
index 2d8df36a18d3..0d215bc8099b 100644
--- a/src/messages/MClassAck.h
+++ b/src/messages/MClassAck.h
@@ -23,7 +23,12 @@ public:
   version_t last;
   
   MClassAck() : PaxosServiceMessage(MSG_CLASS_ACK, 0) {}
-  MClassAck(ceph_fsid_t& f, version_t l) : PaxosServiceMessage(MSG_CLASS_ACK, l), fsid(f), last(l) {}
+  MClassAck(ceph_fsid_t& f, version_t l) : PaxosServiceMessage(MSG_CLASS_ACK, VERSION_T),
+					   fsid(f), last(l) {}
+
+  MClassAck(ceph_fsid_t& f, version_t l, version_t paxos_version) :
+    PaxosServiceMessage(MSG_CLASS_ACK, paxos_version), fsid(f), last(l) {}
+
 
   const char *get_type_name() { return "class_ack"; }
   void print(ostream& out) {