btrfs: let the assertion expression compile in all configs

[sfrench/cifs-2.6.git] / fs / btrfs / ctree.h

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 007b0e81992a473fd4705f75e9666f1df78a4d49..2399f56d8a544f6891716d0599b94c730fffc00c 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3518,21 +3518,18 @@ do {                                                            \
        rcu_read_unlock();                                      \
 } while (0)
 
-#ifdef CONFIG_BTRFS_ASSERT
-
 __cold
 static inline void assfail(const char *expr, const char *file, int line)
 {
-       pr_err("assertion failed: %s, file: %s, line: %d\n",
-              expr, file, line);
-       BUG();
+       if (IS_ENABLED(CONFIG_BTRFS_ASSERT)) {
+               pr_err("assertion failed: %s, file: %s, line: %d\n",
+                      expr, file, line);
+               BUG();
+       }
 }
 
 #define ASSERT(expr)   \
        (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))
-#else
-#define ASSERT(expr)   ((void)0)
-#endif
 
 /*
  * Use that for functions that are conditionally exported for sanity tests but