From: Samuel Just <sam.just@inktank.com>
Date: Fri, 24 May 2013 03:08:11 +0000 (-0700)
Subject: Merge branch 'wip_scrub_tphandle' into next
X-Git-Tag: v0.63~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c1c2d98c6dc0611e4eb09086fb3939088bad826;p=ceph.git

Merge branch 'wip_scrub_tphandle' into next

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

8c1c2d98c6dc0611e4eb09086fb3939088bad826
diff --cc src/osd/PG.cc
index cf5aaebcca4c,3575cece695c..a61803a1b0a8
--- a/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) {