From: Sage Weil <sage@inktank.com>
Date: Tue, 18 Jun 2013 01:00:31 +0000 (-0700)
Subject: mon/OSDMOnitor: use provided get_version_full()
X-Git-Tag: v0.67-rc1~175^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d913d20568ee954e53deaa693d7e65c2cca29eb;p=ceph.git

mon/OSDMOnitor: use provided get_version_full()

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ed3c7867666..900f0d6ac19 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1503,7 +1503,7 @@ MOSDMap *OSDMonitor::build_incremental(epoch_t from, epoch_t to)
     } else {
       assert(err == -ENOENT);
       assert(!bl.length());
-      get_version("full", e, bl);
+      get_version_full(e, bl);
       if (bl.length() > 0) {
       //else if (get_version("full", e, bl) > 0) {
       dout(20) << "build_incremental   full " << e << " "
@@ -1551,7 +1551,7 @@ void OSDMonitor::send_incremental(PaxosServiceMessage *req, epoch_t first)
   if (first < get_first_committed()) {
     first = get_first_committed();
     bufferlist bl;
-    int err = get_version("full", first, bl);
+    int err = get_version_full(first, bl);
     assert(err == 0);
     assert(bl.length());
 
@@ -1589,7 +1589,7 @@ void OSDMonitor::send_incremental(epoch_t first, entity_inst_t& dest, bool oneti
   if (first < get_first_committed()) {
     first = get_first_committed();
     bufferlist bl;
-    int err = get_version("full", first, bl);
+    int err = get_version_full(first, bl);
     assert(err == 0);
     assert(bl.length());
 
@@ -1963,7 +1963,7 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
     OSDMap *p = &osdmap;
     if (epoch) {
       bufferlist b;
-      int err = get_version("full", epoch, b);
+      int err = get_version_full(epoch, b);
       if (err == -ENOENT) {
 	r = -ENOENT;
 	goto reply;