update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / tools / rbd_mirror / image_replayer / GetMirrorImageIdRequest.cc

diff --git a/ceph/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc b/ceph/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc
index a6a72b473f36336c2bf9a4ec6b8715f08377bdb1..74e975373832433f75c8ac45567b49f8b675f7d2 100644 (file)
--- a/ceph/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc
+++ b/ceph/src/tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.cc
@@ -4,6 +4,7 @@
 #include "tools/rbd_mirror/image_replayer/GetMirrorImageIdRequest.h"
 #include "include/rados/librados.hpp"
 #include "cls/rbd/cls_rbd_client.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "librbd/ImageCtx.h"
 #include "librbd/Utils.h"
@@ -40,14 +41,14 @@ void GetMirrorImageIdRequest<I>::get_image_id() {
     &GetMirrorImageIdRequest<I>::handle_get_image_id>(
       this);
   int r = m_io_ctx.aio_operate(RBD_MIRRORING, aio_comp, &op, &m_out_bl);
-  assert(r == 0);
+  ceph_assert(r == 0);
   aio_comp->release();
 }
 
 template <typename I>
 void GetMirrorImageIdRequest<I>::handle_get_image_id(int r) {
   if (r == 0) {
-    bufferlist::iterator iter = m_out_bl.begin();
+    auto iter = m_out_bl.cbegin();
     r = librbd::cls_client::mirror_image_get_image_id_finish(
       &iter, m_image_id);
   }