From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sat, 31 Mar 2018 09:58:07 +0000 (+0800)
Subject: osd/PG: drop unused input "handle" from _scan_rollback_obs()
X-Git-Tag: v13.1.0~379^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fa65b9a5ca79c2129fc474405bebd42b08053a2;p=ceph.git

osd/PG: drop unused input "handle" from _scan_rollback_obs()

Well, I think this is unnecessary since we already hard-cap
max objects to scan at a time into
[osd_scrub_chunk_min, osd_scrub_chunk_max].

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 930f3a4b7650..6b3c436f7ba7 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4361,9 +4361,7 @@ void PG::scrub_unreserve_replicas()
   }
 }
 
-void PG::_scan_rollback_obs(
-  const vector<ghobject_t> &rollback_obs,
-  ThreadPool::TPHandle &handle)
+void PG::_scan_rollback_obs(const vector<ghobject_t> &rollback_obs)
 {
   ObjectStore::Transaction t;
   eversion_t trimmed_to = last_rollback_info_trimmed_to_applied;
@@ -4549,7 +4547,7 @@ int PG::build_scrub_map_chunk(
     if (pos.ls.empty()) {
       break;
     }
-    _scan_rollback_obs(rollback_obs, handle);
+    _scan_rollback_obs(rollback_obs);
     pos.pos = 0;
     return -EINPROGRESS;
   }
diff --git a/src/osd/PG.h b/src/osd/PG.h
index 0575cd8cc9ee..798c0e2fd34a 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -1728,9 +1728,7 @@ protected:
   void scrub_clear_state();
   void _scan_snaps(ScrubMap &map);
   void _repair_oinfo_oid(ScrubMap &map);
-  void _scan_rollback_obs(
-    const vector<ghobject_t> &rollback_obs,
-    ThreadPool::TPHandle &handle);
+  void _scan_rollback_obs(const vector<ghobject_t> &rollback_obs);
   void _request_scrub_map(pg_shard_t replica, eversion_t version,
                           hobject_t start, hobject_t end, bool deep,
 			  bool allow_preemption);