Merge pull request ceph#5632 from ceph/wip-fix-ftbfs-4998

osd: fix the FTBFS introduced by be28319 Reviewed-by: Greg Farnum <[email protected]>
shishirng · Aug 21, 2015 · 2daccff · 2daccff
2 parents e06207a + d1c4086
commit 2daccff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;
   }