From: Xinze Chi <xmdxcxz@gmail.com>
Date: Wed, 5 Nov 2014 08:24:36 +0000 (+0000)
Subject: osd: cache pool: delete dead code in ReplicatedPG::agent_choose_mode
X-Git-Tag: v0.89~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2860%2Fhead;p=ceph.git

osd: cache pool: delete dead code in ReplicatedPG::agent_choose_mode

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index bfceffa50f2..a72c30259ab 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -11829,11 +11829,7 @@ void ReplicatedPG::agent_choose_mode(bool restart)
     // set effort in [0..1] range based on where we are between
     evict_mode = TierAgentState::EVICT_MODE_SOME;
     uint64_t over = full_micro - evict_target;
-    uint64_t span;
-    if (evict_target >= 1000000)
-      span = 1;
-    else
-      span = 1000000 - evict_target;
+    uint64_t span  = 1000000 - evict_target;
     evict_effort = MAX(over * 1000000 / span,
 		       (unsigned)(1000000.0 * g_conf->osd_agent_min_evict_effort));