From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 13 Jul 2020 13:56:54 +0000 (+0200)
Subject: crimson/common: switch to ceph_abort_msg() in errorator.
X-Git-Tag: v16.1.0~1629^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a968ee6bbbea25db4479917c36f9661dd964137;p=ceph.git

crimson/common: switch to ceph_abort_msg() in errorator.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/common/errorator.h b/src/crimson/common/errorator.h
index 0afc6df0230e..303b748a0060 100644
--- a/src/crimson/common/errorator.h
+++ b/src/crimson/common/errorator.h
@@ -192,7 +192,7 @@ struct stateful_error_t : error_t<stateful_error_t<ErrorT>> {
       } catch (const ErrorT& obj) {
         return std::invoke(std::forward<Func>(func), obj);
       }
-      assert("exception type mismatch – impossible!" == nullptr);
+      ceph_abort_msg("exception type mismatch – impossible!");
     };
   }
 
@@ -747,7 +747,7 @@ public:
       static_assert(contains_once_v<std::decay_t<ErrorT>>,
                     "discarding disallowed ErrorT");
       if (msg) {
-        ceph_abort(msg);
+        ceph_abort_msg(msg);
       } else {
         ceph_abort();
       }