Revert the change from assert(0)-> ceph_abort() where is not applicable

Signed-off-by: Dave Chen <wei.d.chen@intel.com>

diff --git a/src/include/assert.h b/src/include/assert.h
index fa2582d75cbf74f13bc936f1f177b6a38bed10f3..bd39187a7a7e1fde17ca3f3cee2f21ddafb0d0f5 100644 (file)
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -85,7 +85,7 @@ using namespace ceph;
 /*
  * ceph_abort aborts the program with a nice backtrace.
  *
- * Currently, it's the same as ceph_abort(), but we may one day make assert a
+ * Currently, it's the same as assert(0), but we may one day make assert a
  * debug-only thing, like it is in many projects.
  */
 #define ceph_abort() abort()

diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 08b53d9b7428e6859fc124cda3058f3d89a3a3cd..8c9ad9e54a8a33776d88f79bf08571327456c827 100644 (file)
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -554,6 +554,7 @@ public:
    *
    * @param m The Message we are fast dispatching. We take ownership
    * of one reference to it.
+   * If none of our Dispatchers can handle it, ceph_abort().
    */
   void ms_fast_dispatch(Message *m) {
     m->set_dispatch_stamp(ceph_clock_now());
@@ -580,7 +581,7 @@ public:
   /**
    *  Deliver a single Message. Send it to each Dispatcher
    *  in sequence until one of them handles it.
-   *  If none of our Dispatchers can handle it, ceph_abort().
+   *  If none of our Dispatchers can handle it, assert(0).
    *
    *  @param m The Message to deliver. We take ownership of
    *  one reference to it.