From: Sage Weil <sage@redhat.com>
Date: Mon, 27 Jun 2016 18:23:06 +0000 (-0700)
Subject: include/assert: drop some dead code
X-Git-Tag: ses5-milestone5~516^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc1ca22a3fd7595b743dd5f5ac96ec840aab2261;p=ceph.git

include/assert: drop some dead code

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/include/assert.h b/src/include/assert.h
index 08a72c28ee8..a85452a17e8 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -86,26 +86,6 @@ extern void __ceph_assert_warn(const char *assertion, const char *file, int line
    ? __CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assert_warn (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
 
-/*
-#define assert(expr)							\
-  do {									\
-	static int __assert_flag = 0;					\
-	struct TlsData *tls = tls_get_val();				\
-	if (!__assert_flag && tls && tls->disable_assert) {		\
-		__assert_flag = 1;					\
-		__ceph_assert_warn(__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION); \
-	}								\
-	((expr)								\
-	? __CEPH_ASSERT_VOID_CAST (0)					\
-	: __ceph_assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION)); \
-  } while (0)
-#endif
-*/
-/*
-#define assert_protocol(expr)	assert(expr)
-#define assert_disk(expr)	assert(expr)
-*/
-
 #ifdef __cplusplus
 }