Btrfs-progs: check, fix false error reports for shared prealloc extents

[platform/upstream/btrfs-progs.git] / kerncompat.h

diff --git a/kerncompat.h b/kerncompat.h
index 3362d25..fa96715 100644 (file)
--- 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
@@ -301,7 +296,12 @@ static inline void assert_trace(const char *assertion, const char *filename,
 {
        if (val)
                return;
-       warning_trace(assertion, filename, func, line, val);
+       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);
 }
@@ -317,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)