update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/librbd/operation/SnapshotLimitRequest.cc b/ceph/src/librbd/operation/SnapshotLimitRequest.cc
index 670e0f0c165fe7783f4545e25cf872365c3dc04a..d47dc3a86af2353be9958632b6c4318e2b7a936e 100644 (file)
--- a/ceph/src/librbd/operation/SnapshotLimitRequest.cc
+++ b/ceph/src/librbd/operation/SnapshotLimitRequest.cc
@@ -29,7 +29,7 @@ template <typename I>
 bool SnapshotLimitRequest<I>::should_complete(int r) {
   I &image_ctx = this->m_image_ctx;
   CephContext *cct = image_ctx.cct;
-  ldout(cct, 5) << this << " " << __func__ << "r=" << r << dendl;
+  ldout(cct, 5) << this << " " << __func__ << " r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "encountered error: " << cpp_strerror(r) << dendl;
@@ -40,7 +40,7 @@ bool SnapshotLimitRequest<I>::should_complete(int r) {
 template <typename I>
 void SnapshotLimitRequest<I>::send_limit_snaps() {
   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, 5) << this << " " << __func__ << dendl;
@@ -56,7 +56,7 @@ void SnapshotLimitRequest<I>::send_limit_snaps() {
       this->create_callback_completion();
     int r = image_ctx.md_ctx.aio_operate(image_ctx.header_oid, rados_completion,
                                         &op);
-    assert(r == 0);
+    ceph_assert(r == 0);
     rados_completion->release();
   }
 }