From: Mykola Golub <mgolub@mirantis.com>
Date: Wed, 24 Feb 2016 11:35:23 +0000 (+0200)
Subject: librbd: make journal start_external_replay not block
X-Git-Tag: v10.1.0~133^2^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23e72e4b54885e8842cae29c861a2fcbba91f10e;p=ceph.git

librbd: make journal start_external_replay not block

Its caller shall check the journal is in right state.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index 4a2a9df6983a..dcb62ae8f792 100644
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -712,15 +712,6 @@ int Journal<I>::start_external_replay(journal::Replay<I> **journal_replay) {
   CephContext *cct = m_image_ctx.cct;
   ldout(cct, 20) << this << " " << __func__ << dendl;
 
-  C_SaferCond cond;
-  wait_for_journal_ready(&cond);
-  int r = cond.wait();
-  if (r < 0) {
-    lderr(cct) << "failed waiting for ready state: " << cpp_strerror(r)
-	       << dendl;
-    return r;
-  }
-
   Mutex::Locker locker(m_lock);
   assert(m_state == STATE_READY);
   assert(m_journal_replay == nullptr);