]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: fix journal create compilation error
authorJason Dillaman <dillaman@redhat.com>
Tue, 27 Sep 2016 18:47:02 +0000 (14:47 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 11 Oct 2016 16:44:30 +0000 (12:44 -0400)
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>
src/librbd/Journal.cc

index 45e57748c6edfb19f5debb35194639841f5617a9..a0f7285c2aff04f2547e8e8afdcd9834187d3121 100644 (file)
@@ -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}},