From: Kefu Chai <kchai@redhat.com>
Date: Mon, 5 Feb 2018 14:14:37 +0000 (+0800)
Subject: osd: pass ops_blocked_by_scrub() to requeue_scrub()
X-Git-Tag: v13.0.2~337^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20319%2Fhead;p=ceph.git

osd: pass ops_blocked_by_scrub() to requeue_scrub()

less nesting levels, and less repeatings.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 27c1fa7d21ed..d921e858c4cd 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3908,11 +3908,7 @@ void PG::do_replica_scrub_map(OpRequestRef op)
     scrub_preempted = true;
   }
   if (scrubber.waiting_on_whom.empty()) {
-    if (ops_blocked_by_scrub()) {
-      requeue_scrub(true);
-    } else {
-      requeue_scrub(false);
-    }
+    requeue_scrub(ops_blocked_by_scrub());
   }
 }
 
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 85056b44db6a..9c26ebd6a665 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -10004,12 +10004,7 @@ void PrimaryLogPG::op_applied(const eversion_t &applied_version)
   if (is_primary()) {
     if (scrubber.active) {
       if (last_update_applied >= scrubber.subset_last_update) {
-        if (ops_blocked_by_scrub()) {
-          requeue_scrub(true);
-        } else {
-          requeue_scrub(false);
-        }
-
+	requeue_scrub(ops_blocked_by_scrub());
       }
     } else {
       assert(scrubber.start == scrubber.end);
@@ -11210,11 +11205,7 @@ void PrimaryLogPG::_applied_recovered_object(ObjectContextRef obc)
   // requeue an active chunky scrub waiting on recovery ops
   if (!deleting && active_pushes == 0
       && scrubber.is_chunky_scrub_active()) {
-    if (ops_blocked_by_scrub()) {
-      requeue_scrub(true);
-    } else {
-      requeue_scrub(false);
-    }
+    requeue_scrub(ops_blocked_by_scrub());
   }
 }