From 50383df7b9ed57bff0f51257e7e8581d79ec45b7 Mon Sep 17 00:00:00 2001
From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 4 Feb 2020 11:03:14 -0500
Subject: [PATCH] librbd: pass mirror image mode from create image to enable
 mirror

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---
 src/librbd/image/CreateRequest.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc
index 0888b125e2643..a2fbb89dd5c9e 100644
--- a/src/librbd/image/CreateRequest.cc
+++ b/src/librbd/image/CreateRequest.cc
@@ -654,10 +654,8 @@ void CreateRequest<I>::mirror_image_enable() {
   auto ctx = create_context_callback<
     CreateRequest<I>, &CreateRequest<I>::handle_mirror_image_enable>(this);
 
-  // TODO: in future rbd-mirror will want to enable mirroring
-  // not only in journal mode.
   auto req = mirror::EnableRequest<I>::create(
-    m_io_ctx, m_image_id, cls::rbd::MIRROR_IMAGE_MODE_JOURNAL,
+    m_io_ctx, m_image_id, m_mirror_image_mode,
     m_non_primary_global_image_id, m_op_work_queue, ctx);
   req->send();
 }
-- 
2.39.5