update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / librbd / operation / MetadataSetRequest.cc

diff --git a/ceph/src/librbd/operation/MetadataSetRequest.cc b/ceph/src/librbd/operation/MetadataSetRequest.cc
index 0142d827c9593b1f09ee1e8f31fdaba7c3fa218e..760e9b1e32e4a1831b5d972e4ce8d5bdd305015f 100644 (file)
--- a/ceph/src/librbd/operation/MetadataSetRequest.cc
+++ b/ceph/src/librbd/operation/MetadataSetRequest.cc
@@ -30,7 +30,7 @@ template <typename I>
 bool MetadataSetRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 20) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 20) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
@@ -41,7 +41,7 @@ bool MetadataSetRequest<I>::should_complete(int r) {
 template <typename I>
 void MetadataSetRequest<I>::send_metadata_set() {
   I &image_ctx = this->m_image_ctx;
-  assert(image_ctx.owner_lock.is_locked());
+  ceph_assert(image_ctx.owner_lock.is_locked());
 
   CephContext *cct = image_ctx.cct;
   ldout(cct, 20) << this << " " << __func__ << dendl;
@@ -52,7 +52,7 @@ void MetadataSetRequest<I>::send_metadata_set() {
 
   librados::AioCompletion *comp = this->create_callback_completion();
   int r = image_ctx.md_ctx.aio_operate(image_ctx.header_oid, comp, &op);
-  assert(r == 0);
+  ceph_assert(r == 0);
   comp->release();
 }