From: Sage Weil <sage@inktank.com>
Date: Tue, 9 Jul 2013 04:40:36 +0000 (-0700)
Subject: mon/OSDMonitor: remove dup service_should_trim() implementation
X-Git-Tag: v0.67-rc1~134^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b71a00966cea68074d8a04a027340d715f018bde;p=ceph.git

mon/OSDMonitor: remove dup service_should_trim() implementation

This matches the parent.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index d6426e4e493..541aac647f3 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -560,12 +560,6 @@ void OSDMonitor::encode_trim_extra(MonitorDBStore::Transaction *tx, version_t fi
   put_version_full(tx, first, bl);
 }
 
-bool OSDMonitor::service_should_trim()
-{
-  update_trim();
-  return (get_trim_to() > 0);
-}
-
 // -------------
 
 bool OSDMonitor::preprocess_query(PaxosServiceMessage *m)
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 5f558719e32..daf2e17dac1 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -184,7 +184,6 @@ private:
   bool should_propose(double &delay);
 
   void update_trim();
-  bool service_should_trim();
 
   bool can_mark_down(int o);
   bool can_mark_up(int o);