]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: cache pool: delete dead code in ReplicatedPG::agent_choose_mode 2860/head
authorXinze Chi <xmdxcxz@gmail.com>
Wed, 5 Nov 2014 08:24:36 +0000 (08:24 +0000)
committerXinze Chi <xmdxcxz@gmail.com>
Wed, 5 Nov 2014 08:24:36 +0000 (08:24 +0000)
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
src/osd/ReplicatedPG.cc

index bfceffa50f2d92274975e5faae985745ba5a4bca..a72c30259ab0ac1170c12cf96d894fcab2d2b2f3 100644 (file)
@@ -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));