Merge branch 'wip_scrub_tphandle' into next

Fixes: #5159
Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/PG.cc
index cf5aaebcca4cdf6feca9ff993fdcf026a16f7b1f,3575cece695cafb0ac72f4e410948807ee0f67b5..a61803a1b0a846c91bec443aff63df717a63be95
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -4076,8 -4080,7 +4095,8 @@@ void PG::classic_scrub(ThreadPool::TPHa
   * scrubber.state encodes the current state of the scrub (refer to state diagram
   * for details).
   */
- void PG::chunky_scrub()
 -void PG::chunky_scrub(ThreadPool::TPHandle &handle) {
++void PG::chunky_scrub(ThreadPool::TPHandle &handle)
 +{
    // check for map changes
    if (scrubber.is_chunky_scrub_active()) {
      if (scrubber.epoch_start != info.history.same_interval_since) {

diff --cc src/osd/PG.h
Simple merge