fix ASSERT and ASSERT_ALWAYS

- remove the != 0 inside the unlikely in ASSERT_ALWAYS because sparse now complains about comparisms between pointers and 0
- add a standalone ASSERT implementation because defining it to ASSERT_ALWAYS means the string is expanded before the #token passing stringification. This way we get the actual content of the assertatio in the assfail message and don't overflow sparse's strinification buffer leading to sparse error messages.

Signed-off-by Christoph Hellwig <[email protected]>

Index: linux-2.6-xfs/fs/xfs/support/debug.h
===================================================================

fs/xfs/support/debug.h +6 -4

@@ -34,10 +34,10 @@ extern void cmn_err(int, char *, ...)
 extern void assfail(char *expr, char *f, int l);
 
 #define ASSERT_ALWAYS(expr)	\
-	(unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
+	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
 #ifndef DEBUG
-# define ASSERT(expr)	((void)0)
+#define ASSERT(expr)	((void)0)
 
 #ifndef STATIC
 # define STATIC static noinline

@@ -49,8 +49,10 @@ extern void assfail(char *expr, char *f,
 
 #else /* DEBUG */
 
-# define ASSERT(expr)	ASSERT_ALWAYS(expr)
-# include <linux/random.h>
+#include <linux/random.h>
+
+#define ASSERT(expr)	\
+	(unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
 
 #ifndef STATIC
 # define STATIC noinline

- remove the != 0 inside the unlikely in ASSERT_ALWAYS because sparse now complains about comparisms between pointers and 0
- add a standalone ASSERT implementation because defining it to ASSERT_ALWAYS means the string is expanded before the #token passing stringification. This way we get the actual content of the assertatio in the assfail message and don't overflow sparse's strinification buffer leading to sparse error messages.

Signed-off-by Christoph Hellwig <[email protected]>