From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 27 Sep 2016 18:47:02 +0000 (-0400)
Subject: librbd: fix journal create compilation error
X-Git-Tag: v10.2.4~61^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bbd8ba4282ea7f3fa286d0a1944e9e93d321365;p=ceph.git

librbd: fix journal create compilation error

The synchronous journal create method no longer exists on the master
branch and the associated change to introduce an asynchronous journal
creation state machine should be delayed to provide more testing time
on the master branch before being backported to jewel.

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

diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index 45e57748c6ed..a0f7285c2aff 100644
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -380,14 +380,14 @@ int Journal<I>::create(librados::IoCtx &io_ctx, const std::string &image_id,
 
   cls::journal::Client client;
   cls::journal::Tag tag;
-  journal::TagData tag_data;
 
   assert(non_primary ^ primary_mirror_uuid.empty());
   std::string mirror_uuid = (non_primary ? primary_mirror_uuid :
                                            LOCAL_MIRROR_UUID);
+  journal::TagPredecessor predecessor;
   r = allocate_journaler_tag(cct, &journaler, client,
-                             cls::journal::Tag::TAG_CLASS_NEW,
-                             tag_data, mirror_uuid, &tag);
+			     cls::journal::Tag::TAG_CLASS_NEW,
+                             predecessor, mirror_uuid, &tag);
 
   bufferlist client_data;
   ::encode(journal::ClientData{journal::ImageClientMeta{tag.tag_class}},