From: Sage Weil <sage@newdream.net>
Date: Thu, 25 Jun 2009 02:58:19 +0000 (-0700)
Subject: osd: fix MOSDBoot, MOSDGetMap initialization
X-Git-Tag: v0.10~157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8dd6d21140f52314a3e331eb2e37dae6da25a7af;p=ceph.git

osd: fix MOSDBoot, MOSDGetMap initialization
---

diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h
index 678a0842e5a9..96650b525e43 100644
--- a/src/messages/MOSDBoot.h
+++ b/src/messages/MOSDBoot.h
@@ -26,7 +26,7 @@ class MOSDBoot : public PaxosServiceMessage {
 
   MOSDBoot() : PaxosServiceMessage(){}
   MOSDBoot(OSDSuperblock& s) : 
-    PaxosServiceMessage(MSG_OSD_BOOT, sb.current_epoch), sb(s) {
+    PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch), sb(s) {
   }
 
   const char *get_type_name() { return "osd_boot"; }
diff --git a/src/messages/MOSDGetMap.h b/src/messages/MOSDGetMap.h
index 63a2a7fc0650..677b49d94b23 100644
--- a/src/messages/MOSDGetMap.h
+++ b/src/messages/MOSDGetMap.h
@@ -26,7 +26,7 @@ class MOSDGetMap : public PaxosServiceMessage {
 
   MOSDGetMap() : PaxosServiceMessage(CEPH_MSG_OSD_GETMAP, 0) {}
   MOSDGetMap(ceph_fsid_t& f, epoch_t s=0) : 
-    PaxosServiceMessage(CEPH_MSG_OSD_GETMAP, start-1),
+    PaxosServiceMessage(CEPH_MSG_OSD_GETMAP, s-1),
     fsid(f), start(s) { }
 
   epoch_t get_start_epoch() { return start; }