btrfs-progs: convert: Fix offset-by-one error in read_data_extent()

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

diff --git a/kerncompat.h b/kerncompat.h
index 1493cad..fa96715 100644 (file)
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -299,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);
 }
@@ -314,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)