X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kerncompat.h;h=fa96715fb70cef75e8c95603f5034a39d57a268e;hb=ee76a212a8027ce876dd2c17e1d10b99bdeb9877;hp=5a543c22152bd39f1907ac39f8fe5c2e163c517b;hpb=bc2d4ccc46e2807964c74ce805fb6405ca2bc842;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/kerncompat.h b/kerncompat.h
index 5a543c2..fa96715 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -93,14 +93,9 @@ static inline void warning_trace(const char *assertion, const char *filename,
 {
 	if (!val)
 		return;
-	if (assertion)
-		fprintf(stderr,
-			"%s:%d: %s: Warning: assertion `%s` failed, value %ld\n",
-			filename, line, func, assertion, val);
-	else
-		fprintf(stderr,
-			"%s:%d: %s: Warning: assertion failed, value %ld.\n",
-			filename, line, func, val);
+	fprintf(stderr,
+		"%s:%d: %s: Warning: assertion `%s` failed, value %ld\n",
+		filename, line, func, assertion, val);
 #ifndef BTRFS_DISABLE_BACKTRACE
 	print_trace();
 #endif
@@ -304,6 +299,9 @@ static inline void assert_trace(const char *assertion, const char *filename,
 	fprintf(stderr,
 		"%s:%d: %s: Assertion `%s` failed, value %ld\n",
 		filename, line, func, assertion, val);
+#ifndef BTRFS_DISABLE_BACKTRACE
+	print_trace();
+#endif
 	abort();
 	exit(1);
 }
@@ -319,11 +317,13 @@ static inline void assert_trace(const char *assertion, const char *filename,
 #define container_of(ptr, type, member) ({                      \
         const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
 	        (type *)( (char *)__mptr - offsetof(type,member) );})
+#ifndef __bitwise
 #ifdef __CHECKER__
 #define __bitwise __bitwise__
 #else
 #define __bitwise
-#endif
+#endif /* __CHECKER__ */
+#endif	/* __bitwise */
 
 /* Alignment check */
 #define IS_ALIGNED(x, a)                (((x) & ((typeof(x))(a) - 1)) == 0)