From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 23 Aug 2018 15:25:16 +0000 (-0400)
Subject: libradosstriper: Use ceph_assert for asserts.
X-Git-Tag: v14.0.1~475^2~13
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd76b57fcb1293cb280bc84248e19eca467d8827;p=ceph.git

libradosstriper: Use ceph_assert for asserts.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/libradosstriper/MultiAioCompletionImpl.cc b/src/libradosstriper/MultiAioCompletionImpl.cc
index 7bb21bc0e0e3c..f13d2c9525b88 100644
--- a/src/libradosstriper/MultiAioCompletionImpl.cc
+++ b/src/libradosstriper/MultiAioCompletionImpl.cc
@@ -25,7 +25,7 @@ void libradosstriper::MultiAioCompletionImpl::complete_request(ssize_t r)
     else if (r > 0)
       rval += r;
   }
-  assert(pending_complete);
+  ceph_assert(pending_complete);
   int count = --pending_complete;
   if (!count && !building) {
     complete();
@@ -40,7 +40,7 @@ void libradosstriper::MultiAioCompletionImpl::safe_request(ssize_t r)
     if (r < 0 && r != -EEXIST)
       rval = r;
   }
-  assert(pending_safe);
+  ceph_assert(pending_safe);
   int count = --pending_safe;
   if (!count && !building) {
     safe();
@@ -51,7 +51,7 @@ void libradosstriper::MultiAioCompletionImpl::safe_request(ssize_t r)
 void libradosstriper::MultiAioCompletionImpl::finish_adding_requests()
 {
   lock.Lock();
-  assert(building);
+  ceph_assert(building);
   building = false;
   if (!pending_complete)
     complete();
diff --git a/src/libradosstriper/MultiAioCompletionImpl.h b/src/libradosstriper/MultiAioCompletionImpl.h
index 696f3def90e80..24188ab6e7dd6 100644
--- a/src/libradosstriper/MultiAioCompletionImpl.h
+++ b/src/libradosstriper/MultiAioCompletionImpl.h
@@ -125,8 +125,8 @@ struct libradosstriper::MultiAioCompletionImpl {
     lock.Unlock();
   }
   void _get() {
-    assert(lock.is_locked());
-    assert(ref > 0);
+    ceph_assert(lock.is_locked());
+    ceph_assert(ref > 0);
     ++ref;
   }
   void put() {
@@ -134,7 +134,7 @@ struct libradosstriper::MultiAioCompletionImpl {
     put_unlock();
   }
   void put_unlock() {
-    assert(ref > 0);
+    ceph_assert(ref > 0);
     int n = --ref;
     lock.Unlock();
     if (!n)
@@ -155,7 +155,7 @@ struct libradosstriper::MultiAioCompletionImpl {
     lock.Unlock();
   }
   void complete() {
-    assert(lock.is_locked());
+    ceph_assert(lock.is_locked());
     if (callback_complete) {
       callback_complete(this, callback_complete_arg);
       callback_complete = 0;
@@ -163,7 +163,7 @@ struct libradosstriper::MultiAioCompletionImpl {
     cond.Signal();
   }
   void safe() {
-    assert(lock.is_locked());
+    ceph_assert(lock.is_locked());
     if (callback_safe) {
       callback_safe(this, callback_safe_arg);
       callback_safe = 0;
diff --git a/src/libradosstriper/libradosstriper.cc b/src/libradosstriper/libradosstriper.cc
index e7dc912eb2f18..9aa764b929553 100644
--- a/src/libradosstriper/libradosstriper.cc
+++ b/src/libradosstriper/libradosstriper.cc
@@ -34,7 +34,7 @@
 
 libradosstriper::MultiAioCompletion::~MultiAioCompletion()
 {
-  assert(pc->ref == 1);
+  ceph_assert(pc->ref == 1);
   pc->put();
 }
 
@@ -337,7 +337,7 @@ libradosstriper::RadosStriper::multi_aio_create_completion(void *cb_arg,
 {
   MultiAioCompletionImpl *c;
   int r = rados_striper_multi_aio_create_completion(cb_arg, cb_complete, cb_safe, (void**)&c);
-  assert(r == 0);
+  ceph_assert(r == 0);
   return new MultiAioCompletion(c);
 }