From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 11 Oct 2016 17:55:21 +0000 (-0400)
Subject: journal: fix AsyncOpTracker compiler error
X-Git-Tag: v10.2.4~61^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efa12f7187b6e037c22ba62563030eb883dab5f9;p=ceph.git

journal: fix AsyncOpTracker compiler error

The master branch has an async JournalTrimmer which shouldn't be
backported to the Jewel branch yet. This change addresses the
missing sync AsyncOpTracker::wait_for_ops method from the backported
class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index 18b8e38b37a1..6612d9ffd15a 100644
--- a/src/journal/JournalTrimmer.cc
+++ b/src/journal/JournalTrimmer.cc
@@ -49,7 +49,9 @@ void JournalTrimmer::shut_down(Context *on_finish) {
 
 int JournalTrimmer::remove_objects(bool force) {
   ldout(m_cct, 20) << __func__ << dendl;
-  m_async_op_tracker.wait_for_ops();
+  C_SaferCond ops_ctx;
+  m_async_op_tracker.wait_for_ops(&ops_ctx);
+  ops_ctx.wait();
 
   C_SaferCond ctx;
   {