From: Kefu Chai <kchai@redhat.com>
Date: Fri, 21 Aug 2015 09:20:38 +0000 (-0700)
Subject: osd: fix the FTBFS introduced by be28319
X-Git-Tag: v9.1.0~328^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d1c4086808f9d0ec3facfb4df8fc4bdca16229e5;p=ceph.git

osd: fix the FTBFS introduced by be28319

the signature of Scrubber::write_blocked_by_scrub() was changed in #5470.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index c93851f23daf..2527052f9cc2 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10594,7 +10594,7 @@ void ReplicatedPG::hit_set_remove_all()
     // Once we hit a degraded object just skip
     if (is_degraded_or_backfilling_object(aoid))
       return;
-    if (scrubber.write_blocked_by_scrub(aoid))
+    if (scrubber.write_blocked_by_scrub(aoid, get_sort_bitwise()))
       return;
   }