From: Samuel Just <sjust@redhat.com>
Date: Tue, 5 Jan 2016 23:18:33 +0000 (-0800)
Subject: Revert "osd: fix arithmetic exception when scrub_min_interval is small"
X-Git-Tag: v10.0.2~3^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64cb6e55698c4a684a36642b51f3c8ba26e118db;p=ceph.git

Revert "osd: fix arithmetic exception when scrub_min_interval is small"

This reverts commit a828a4df54f040a39f54c4cdecde234376301be5.
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1d0ca9c57f21..f89bd828cebd 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6088,10 +6088,9 @@ OSDService::ScrubJob::ScrubJob(const spg_t& pg, const utime_t& timestamp,
       pool_scrub_max_interval : g_conf->osd_scrub_max_interval;
 
     sched_time += scrub_min_interval;
-    int divisor = scrub_min_interval *
-      g_conf->osd_scrub_interval_randomize_ratio;
-    if (divisor > 0) {
-      sched_time += rand() % divisor;
+    if (g_conf->osd_scrub_interval_randomize_ratio > 0) {
+      sched_time += rand() % (int)(scrub_min_interval *
+				   g_conf->osd_scrub_interval_randomize_ratio);
     }
     deadline += scrub_max_interval;
   }