From 7bcc960b31a1719b691692ec9d8cdaaf3a016e0b Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 15 Jan 2016 10:40:06 -0500
Subject: [PATCH] librbd: handle additional journal replay states

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 src/librbd/Journal.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index cf5fc1d7290d..3b52f522eefb 100644
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -217,7 +217,9 @@ bool Journal<I>::is_journal_ready() const {
 template <typename I>
 bool Journal<I>::is_journal_replaying() const {
   Mutex::Locker locker(m_lock);
-  return (m_state == STATE_REPLAYING);
+  return (m_state == STATE_REPLAYING ||
+          m_state == STATE_FLUSHING_REPLAY ||
+          m_state == STATE_RESTARTING_REPLAY);
 }
 
 template <typename I>
@@ -581,7 +583,7 @@ void Journal<I>::handle_replay_ready() {
   bufferlist data = replay_entry.get_data();
   bufferlist::iterator it = data.begin();
   Context *on_ready = create_context_callback<
-      Journal<I>, &Journal<I>::handle_replay_process_ready>(this);
+    Journal<I>, &Journal<I>::handle_replay_process_ready>(this);
   Context *on_commit = new C_ReplayProcessSafe(this, std::move(replay_entry));
 
   m_journal_replay->process(&it, on_ready, on_commit);
-- 
2.47.3